From b6a7e5e9cf20e7924f6cf427c66e9aeb42fa77f3 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Aug 2015 17:15:05 -0700 Subject: documented flags and misc. fixes --- engine/hidden_object_functions17.asm | 48 ++++++++++++++++----------------- engine/hidden_object_functions7.asm | 14 +++++----- engine/items/items.asm | 2 +- engine/menu/main_menu.asm | 4 +-- engine/menu/naming_screen.asm | 2 +- engine/menu/start_sub_menus.asm | 2 +- engine/oak_speech.asm | 2 +- engine/overworld/movement.asm | 11 +++++--- home/overworld.asm | 4 +-- main.asm | 9 ++++--- scripts/halloffameroom.asm | 4 +-- wram.asm | 52 +++++++++++++++++++++++++++++------- 12 files changed, 98 insertions(+), 56 deletions(-) diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 77f3eeb9..65a4669e 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -95,23 +95,23 @@ LinkCableHelp: ; 5dc29 (17:5c29) ld hl, LinkCableHelpText1 call PrintText xor a - ld [W_ANIMATIONID], a + ld [wMenuItemOffset], a ; not used ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a - ld a, $3 + ld a, 3 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $1 + ld a, 1 ld [wTopMenuItemX], a .linkHelpLoop ld hl, wd730 set 6, [hl] coord hl, 0, 0 - ld b, $8 - ld c, $d + ld b, 8 + ld c, 13 call TextBoxBorder coord hl, 2, 2 ld de, HowToLinkText @@ -122,13 +122,13 @@ LinkCableHelp: ; 5dc29 (17:5c29) bit 1, a ; pressed b jr nz, .exit ld a, [wCurrentMenuItem] - cp $3 ; pressed a on "STOP READING" + cp 3 ; pressed a on "STOP READING" jr z, .exit ld hl, wd730 res 6, [hl] ld hl, LinkCableInfoTexts add a - ld d, $0 + ld d, 0 ld e, a add hl, de ld a, [hli] @@ -179,16 +179,16 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) ld hl, ViridianSchoolBlackboardText1 call PrintText xor a - ld [W_ANIMATIONID], a + ld [wMenuItemOffset], a ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld a, D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a - ld a, $2 + ld a, 2 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $1 + ld a, 1 ld [wTopMenuItemX], a .blackboardLoop ld hl, wd730 @@ -210,34 +210,34 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) bit 4, a ; pressed right jr z, .didNotPressRight ; move cursor to right column - ld a, $2 + ld a, 2 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $6 + ld a, 6 ld [wTopMenuItemX], a - ld a, $3 - ld [W_ANIMATIONID], a + ld a, 3 ; in the the right column, use an offset to prevent overlap + ld [wMenuItemOffset], a jr .blackboardLoop .didNotPressRight bit 5, a ; pressed left jr z, .didNotPressLeftOrRight ; move cursor to left column - ld a, $2 + ld a, 2 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $1 + ld a, 1 ld [wTopMenuItemX], a xor a - ld [W_ANIMATIONID], a + ld [wMenuItemOffset], a jr .blackboardLoop .didNotPressLeftOrRight ld a, [wCurrentMenuItem] ld b, a - ld a, [W_ANIMATIONID] + ld a, [wMenuItemOffset] add b - cp $5 ; cursor is pointing to "QUIT" + cp 5 ; cursor is pointing to "QUIT" jr z, .exitBlackboard ; we must have pressed a on a status condition ; so print the text @@ -245,7 +245,7 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) res 6, [hl] ld hl, ViridianBlackboardStatusPointers add a - ld d, $0 + ld d, 0 ld e, a add hl, de ld a, [hli] diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 02d3928a..0c1e2be2 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -147,7 +147,7 @@ CinnabarGymQuiz: ; 1ea25 (7:6a25) ld h, [hl] ld l, a call PrintText - ld a, $1 + ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a call CinnabarGymQuiz_1ea92 jp TextScriptEnd @@ -391,23 +391,23 @@ BillsHousePokemonList: ; 1ec05 (7:6c05) ld hl, BillsHousePokemonListText1 call PrintText xor a - ld [W_ANIMATIONID], a + ld [wMenuItemOffset], a ; not used ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a - ld a, $4 + ld a, 4 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $1 + ld a, 1 ld [wTopMenuItemX], a .billsPokemonLoop ld hl, wd730 set 6, [hl] coord hl, 0, 0 - ld b, $a - ld c, $9 + ld b, 10 + ld c, 9 call TextBoxBorder coord hl, 2, 2 ld de, BillsMonListText diff --git a/engine/items/items.asm b/engine/items/items.asm index f0666587..e8fe55f4 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1421,7 +1421,7 @@ ItemUseCardKey: ; e022 (3:6022) xor a ld [wUnusedD71F],a call GetTileAndCoordsInFrontOfPlayer - ld a,[GetTileAndCoordsInFrontOfPlayer] ; $4586 + ld a,[GetTileAndCoordsInFrontOfPlayer] cp a,$18 jr nz,.next0 ld hl,CardKeyTable1 diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 6c109cec..78830093 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -20,7 +20,7 @@ MainMenu: ; 5af2 (1:5af2) ld [hli],a ld [hli],a ld [hl],a - ld [W_ANIMATIONID],a + ld [wDefaultMap],a ld hl,wd72e res 6,[hl] call ClearScreen @@ -269,7 +269,7 @@ LinkMenu: ; 5c0a (1:5c0a) call DelayFrames ld hl, wd732 res 1, [hl] - ld a, [W_ANIMATIONID] + ld a, [wDefaultMap] ld [wDestinationMap], a call SpecialWarpIn ld c, 20 diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 978216c8..703d570a 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -166,7 +166,7 @@ DisplayNamingScreen: ; 6596 (1:6596) call RunDefaultPaletteCommand call GBPalNormal xor a - ld [W_SUBANIMTRANSFORM], a + ld [wAnimCounter], a ld hl, wd730 res 6, [hl] ld a, [W_ISINBATTLE] diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index ab8c8756..678877ef 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -160,7 +160,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) .surf bit 4,a ; does the player have the Soul Badge? jp z,.newBadgeRequired - callba CheckForForcedBikeSurf + callba IsSurfingAllowed ld hl,wd728 bit 1,[hl] res 1,[hl] diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 0de7ffad..48e8da80 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -48,7 +48,7 @@ OakSpeech: ; 6115 (1:6115) ld a,1 ld [wItemQuantity],a call AddItemToInventory ; give one potion - ld a,[W_ANIMATIONID] + ld a,[wDefaultMap] ld [wDestinationMap],a call SpecialWarpIn xor a diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index be10fd69..2ed49838 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -133,8 +133,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) ld l, a inc l ld a, [hl] ; c1x1 - bit 7, a - jp nz, InitializeSpriteFacingDirection ; c1x1 >= $80 + bit 7, a ; is the face player flag set? + jp nz, MakeNPCFacePlayer ld b, a ld a, [wFontLoaded] bit 0, a @@ -400,10 +400,15 @@ notYetMoving: ; 5073 (1:5073) ld [hl], $0 ; c1x8 = 0 (walk animation frame) jp UpdateSpriteImage -InitializeSpriteFacingDirection: ; 507f (1:507f) +MakeNPCFacePlayer: ; 507f (1:507f) +; Make an NPC face the player if the player has spoken to him or her. + +; Check if the behaviour of the NPC facing the player when spoken to is +; disabled. This is only done when rubbing the S.S. Anne captain's back. ld a, [wd72d] bit 5, a jr nz, notYetMoving + res 7, [hl] ld a, [wPlayerDirection] bit PLAYER_DIR_BIT_UP, a diff --git a/home/overworld.asm b/home/overworld.asm index 051d055e..9eafba04 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1190,8 +1190,8 @@ IsSpriteInFrontOfPlayer2:: ; 0b6d (0:0b6d) ld a,l and a,$f0 inc a - ld l,a - set 7,[hl] + ld l,a ; hl = $c1x1 + set 7,[hl] ; set flag to make the sprite face the player ld a,e ld [hSpriteIndexOrTextID],a ret diff --git a/main.asm b/main.asm index c87cd1f0..73f6de47 100755 --- a/main.asm +++ b/main.asm @@ -548,7 +548,7 @@ TestBattle: ld [W_OBTAINEDBADGES], a ld hl, W_FLAGS_D733 - set 0, [hl] + set BIT_TEST_BATTLE, [hl] ; Reset the party. ld hl, wPartyCount @@ -668,7 +668,7 @@ LoadSpecialWarpData: ; 62ff (1:62ff) xor a jr .done .notFirstMap - ld a, [wLastMap] + ld a, [wLastMap] ; this value is overwritten before it's ever read ld hl, wd732 bit 4, [hl] ; used dungeon warp (jumped down hole/waterfall)? jr nz, .usedDunegonWarp @@ -2751,7 +2751,10 @@ CanMoveBouldersText: ; cdbb (3:4dbb) TX_FAR _CanMoveBouldersText db "@" -CheckForForcedBikeSurf: ; cdc0 (3:4dc0) +IsSurfingAllowed: ; cdc0 (3:4dc0) +; Returns whether surfing is allowed in bit of d728. +; Surfing isn't allowed on the Cycling Road or in the lowest level of the +; Seafoam Islands before the current has been slowed with boulders. ld hl, wd728 set 1, [hl] ld a, [wd732] diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index 1da6d3f5..de3cd779 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -47,11 +47,11 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) ld [wLastBlackoutMap], a callba SaveSAVtoSRAM ld b, 5 -.asm_5a4ff +.delayLoop ld c, 600 / 5 call DelayFrames dec b - jr nz, .asm_5a4ff + jr nz, .delayLoop call WaitForTextScrollButtonPress jp Init diff --git a/wram.asm b/wram.asm index cfa4cc51..9dd3fea3 100755 --- a/wram.asm +++ b/wram.asm @@ -1746,6 +1746,11 @@ wObjectToShow:: ; d07a ds 1 +wDefaultMap:: ; d07c +; the map you will start at when the debug bit is set + +wMenuItemOffset:: ; d07c + W_ANIMATIONID:: ; d07c ; ID number of the current battle animation ds 1 @@ -1789,7 +1794,7 @@ W_SUBANIMCOUNTER:: ; d087 ; counts the number of subentries left in the current subanimation ds 1 -wSaveFileStatus:: +wSaveFileStatus:: ; d088 ; 1 = no save file or save file is corrupted ; 2 = save file exists and no corruption has been detected ds 1 @@ -2921,8 +2926,14 @@ wUnusedD71F:: ; d71f ds 8 -wd728:: +wd728:: ; d728 ; bit 0: using Strength outside of battle +; bit 1: set by IsSurfingAllowed when surfing's allowed, but the caller resets it after checking the result +; bit 3: received Old Rod +; bit 4: received Good Rod +; bit 5: received Super Rod +; bit 6: gave one of the Saffron guards a drink +; bit 7: set by ItemUseCardKey, which is leftover code from a previous implementation of the Card Key ds 1 ds 1 @@ -2936,16 +2947,36 @@ wBeatGymFlags:: ; d72a wd72c:: ; d72c ; bit 0: if not set, the 3 minimum steps between random battles have passed +; bit 1: prevent audio fade out + ds 1 + +wd72d:: ; d72d +; This variable is used for temporary flags and as the destination map when +; warping to the Trade Center or Colosseum. +; bit 0: sprite facing directions have been initialised in the Trade Center +; bit 3: do scripted warp (used to warp back to Lavender Town from the top of the pokemon tower) +; bit 4: on a dungeon warp +; bit 5: don't make NPCs face the player when spoken to +; Bits 6 and 7 are set by scripts when starting major battles in the storyline, +; but they do not appear to affect anything. Bit 6 is reset after all battles +; and bit 7 is reset after trainer battles (but it's only set before trainer +; battles anyway). + ds 1 + +wd72e:: ; d72e +; bit 0: the player has received Lapras in the Silph Co. building +; bit 1: set in various places, but doesn't appear to have an effect +; bit 2: the player has healed pokemon at a pokemon center at least once +; bit 3: the player has a received a pokemon from Prof. Oak +; bit 4: disable battles +; bit 5: set when a battle ends and when the player blacks out in the overworld due to poison +; bit 6: using the link feature +; bit 7: set if scripted NPC movement has been initialised ds 1 -wd72d:: ds 1 ; misc temp flags? (in some scripts, bit 6 and 7 set after a special battle (e.g. gym leaders) has been won) - ; also used as a start menu flag - -wd72e:: -; bit 7: set if scripted NPC movement has been initialised - ds 2 ; more temp misc flags, used with npc movement, main menu and other stuff + ds 1 -wd730:: +wd730:: ; d730 ; bit 0: NPC sprite being moved by script ; bit 5: ignore joypad input ; bit 6: print text with no delay between each letter @@ -2970,6 +3001,9 @@ wd732:: ; d732 W_FLAGS_D733:: ; d733 ; bit 0: running a test battle +; bit 1: prevent music from changing when entering new map +; bit 2: skip the joypad check in CheckWarpsNoCollision (used for the forced warp down the waterfall in the Seafoam Islands) +; bit 3: trainer wants to battle ; bit 4: use variable [W_CURMAPSCRIPT] instead of the provided index for next frame's map script (used to start battle when talking to trainers) ; bit 7: used fly out of battle ds 1 -- cgit v1.3.1-sl0p From 2ff0f3f208d01c6244c805866a1795be1dfd21ea Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Aug 2015 17:27:57 -0700 Subject: added constants for item capacity --- constants/misc_constants.asm | 3 +++ main.asm | 10 +++++----- wram.asm | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index b42745cc..fd2c7388 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -10,6 +10,9 @@ PARTY_LENGTH EQU 6 MONS_PER_BOX EQU 20 NUM_BOXES EQU 12 +BAG_ITEM_CAPACITY EQU 20 +PC_ITEM_CAPACITY EQU 50 + HOF_MON EQU $10 HOF_TEAM EQU PARTY_LENGTH * HOF_MON HOF_TEAM_CAPACITY EQU 50 diff --git a/main.asm b/main.asm index 73f6de47..300afffd 100755 --- a/main.asm +++ b/main.asm @@ -2752,14 +2752,14 @@ CanMoveBouldersText: ; cdbb (3:4dbb) db "@" IsSurfingAllowed: ; cdc0 (3:4dc0) -; Returns whether surfing is allowed in bit of d728. +; Returns whether surfing is allowed in bit 1 of wd728. ; Surfing isn't allowed on the Cycling Road or in the lowest level of the ; Seafoam Islands before the current has been slowed with boulders. ld hl, wd728 set 1, [hl] ld a, [wd732] bit 5, a - jr nz, .asm_cdec + jr nz, .forcedToRideBike ld a, [W_CURMAP] cp SEAFOAM_ISLANDS_5 ret nz @@ -2772,7 +2772,7 @@ IsSurfingAllowed: ; cdc0 (3:4dc0) res 1, [hl] ld hl, CurrentTooFastText jp PrintText -.asm_cdec +.forcedToRideBike ld hl, wd728 res 1, [hl] ld hl, CyclingIsFunText @@ -2802,7 +2802,7 @@ AddItemToInventory_: ; ce04 (3:4e04) push de push hl push hl - ld d,50 ; PC box can hold 50 items + ld d,PC_ITEM_CAPACITY ; how many items the PC can hold ld a,wNumBagItems & $FF cp l jr nz,.checkIfInventoryFull @@ -2810,7 +2810,7 @@ AddItemToInventory_: ; ce04 (3:4e04) cp h jr nz,.checkIfInventoryFull ; if the destination is the bag - ld d,20 ; bag can hold 20 items + ld d,BAG_ITEM_CAPACITY ; how many items the bag can hold .checkIfInventoryFull ld a,[hl] sub d diff --git a/wram.asm b/wram.asm index 9dd3fea3..acf75346 100755 --- a/wram.asm +++ b/wram.asm @@ -2282,7 +2282,7 @@ wNumBagItems:: ; d31d ds 1 wBagItems:: ; d31e ; item, quantity - ds 20 * 2 + ds BAG_ITEM_CAPACITY * 2 ds 1 ; end wPlayerMoney:: ; d347 @@ -2595,7 +2595,7 @@ wNumBoxItems:: ; d53a ds 1 wBoxItems:: ; d53b ; item, quantity - ds 50 * 2 + ds PC_ITEM_CAPACITY * 2 ds 1 ; end wCurrentBoxNum:: ; d5a0 -- cgit v1.3.1-sl0p From 38d771dc449732a4ca2d6eb6fb150f019eeacd7f Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Aug 2015 23:21:54 -0700 Subject: commented pokeball function --- constants/misc_constants.asm | 5 + engine/items/items.asm | 323 ++++++++++++++++++++++++++++++------------- engine/town_map.asm | 10 +- home.asm | 6 +- wram.asm | 2 + 5 files changed, 247 insertions(+), 99 deletions(-) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index fd2c7388..c9240ad7 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -172,6 +172,11 @@ HP_BAR_RED EQU 2 ; D733 flags BIT_TEST_BATTLE EQU 0 +; battle type constants +BATTLE_TYPE_NORMAL EQU 0 +BATTLE_TYPE_OLD_MAN EQU 1 +BATTLE_TYPE_SAFARI EQU 2 + ; serial ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01 diff --git a/engine/items/items.asm b/engine/items/items.asm index e8fe55f4..7965bc8f 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -101,97 +101,144 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw ItemUsePPRestore ; MAX_ELIXER ItemUseBall: ; d687 (3:5687) + +; Balls can't be used out of battle. ld a,[W_ISINBATTLE] and a - jp z,ItemUseNotTime ; not in battle + jp z,ItemUseNotTime + +; Balls can't catch trainers' Pokémon. dec a jp nz,ThrowBallAtTrainerMon + +; If this is for the old man battle, skip checking if the party & box are full. ld a,[W_BATTLETYPE] dec a - jr z,.UseBall - ld a,[wPartyCount] ;is Party full? + jr z,.canUseBall + + ld a,[wPartyCount] ; is party full? cp a,PARTY_LENGTH - jr nz,.UseBall - ld a,[W_NUMINBOX] ;is Box full? + jr nz,.canUseBall + ld a,[W_NUMINBOX] ; is box full? cp a,MONS_PER_BOX jp z,BoxFullCannotThrowBall -.UseBall -;ok, you can use a ball + +.canUseBall xor a ld [wCapturedMonSpecies],a + ld a,[W_BATTLETYPE] - cp a,2 ;SafariBattle + cp a,BATTLE_TYPE_SAFARI jr nz,.skipSafariZoneCode + .safariZone - ; remove a Safari Ball from inventory ld hl,W_NUMSAFARIBALLS - dec [hl] + dec [hl] ; remove a Safari Ball + .skipSafariZoneCode call RunDefaultPaletteCommand - ld a,$43 - ld [wd11e],a - call LoadScreenTilesFromBuffer1 ;restore screenBuffer from Backup + + ld a,$43 ; successful capture value + ld [wPokeBallAnimData],a + + call LoadScreenTilesFromBuffer1 ld hl,ItemUseText00 call PrintText + +; If the player is fighting an unidentified ghost, set the value that indicates +; the Pokémon can't be caught and skip the capture calculations. callab IsGhostBattle - ld b,$10 - jp z,.next12 + ld b,$10 ; can't be caught value + jp z,.setAnimData + ld a,[W_BATTLETYPE] dec a jr nz,.notOldManBattle + .oldManBattle ld hl,W_GRASSRATE ld de,wPlayerName ld bc,NAME_LENGTH - call CopyData ; save the player's name in the Wild Monster data (part of the Cinnabar Island Missingno glitch) - jp .BallSuccess + call CopyData ; save the player's name in the Wild Monster data (part of the Cinnabar Island Missingno. glitch) + jp .captured + .notOldManBattle + +; If the player is fighting the ghost Marowak, set the value that indicates the +; Pokémon can't be caught and skip the capture calculations. ld a,[W_CURMAP] cp a,POKEMONTOWER_6 jr nz,.loop ld a,[wEnemyMonSpecies2] cp a,MAROWAK - ld b,$10 - jp z,.next12 -; if not fighting ghost Marowak, loop until a random number in the current -; pokeball's allowed range is found + ld b,$10 ; can't be caught value + jp z,.setAnimData + +; Get the first random number. Let it be called Rand1. +; Rand1 must be within a certain range according the kind of ball being thrown. +; The ranges are as follows. +; Poké Ball: [0, 255] +; Great Ball: [0, 200] +; Ultra/Safari Ball: [0, 150] +; Loop until an acceptable number is found. + .loop call Random ld b,a + +; Get the item ID. ld hl,wcf91 ld a,[hl] + +; The Master Ball always succeeds. cp a,MASTER_BALL - jp z,.BallSuccess + jp z,.captured + +; Anything will do for the basic Poké Ball. cp a,POKE_BALL jr z,.checkForAilments + +; If it's a Great/Ultra/Safari Ball and Rand1 is greater than 200, try again. ld a,200 cp b - jr c,.loop ;get only numbers <= 200 for Great Ball + jr c,.loop + +; Less than or equal to 200 is good enough for a Great Ball. ld a,[hl] cp a,GREAT_BALL jr z,.checkForAilments - ld a,150 ;get only numbers <= 150 for Ultra Ball + +; If it's an Ultra/Safari Ball and Rand1 is greater than 150, try again. + ld a,150 cp b jr c,.loop + .checkForAilments -; pokemon can be caught more easily with any (primary) status ailment -; Frozen/Asleep pokemon are relatively even easier to catch -; for Frozen/Asleep pokemon, any random number from 0-24 ensures a catch. -; for the others, a random number from 0-11 ensures a catch. - ld a,[wEnemyMonStatus] ;status ailments +; Pokémon can be caught more easily with a status ailment. +; Depending on the status ailment, a certain value will be subtracted from +; Rand1. Let this value be called Status. +; The larger Status is, the more easily the Pokémon can be caught. +; no status ailment: Status = 0 +; Burn/Paralysis/Poison: Status = 12 +; Freeze/Sleep: Status = 25 +; If Status is greater than Rand1, the Pokémon will be caught for sure. + ld a,[wEnemyMonStatus] and a - jr z,.noAilments - and a, 1 << FRZ | SLP ;is frozen and/or asleep? + jr z,.skipAilmentValueSubtraction ; no ailments + and a, 1 << FRZ | SLP ld c,12 jr z,.notFrozenOrAsleep ld c,25 .notFrozenOrAsleep ld a,b sub c - jp c,.BallSuccess + jp c,.captured ld b,a -.noAilments - push bc ;save RANDOM number + +.skipAilmentValueSubtraction + push bc ; save (Rand1 - Status) + +; Calculate MaxHP * 255. xor a ld [H_MULTIPLICAND],a ld hl,wEnemyMonMaxHP @@ -201,66 +248,96 @@ ItemUseBall: ; d687 (3:5687) ld [H_MULTIPLICAND + 2],a ld a,255 ld [H_MULTIPLIER],a - call Multiply ; MaxHP * 255 + call Multiply + +; Determine BallFactor. It's 8 for Great Balls and 12 for the others. ld a,[wcf91] cp a,GREAT_BALL - ld a,12 ;any other BallFactor + ld a,12 jr nz,.next7 ld a,8 + .next7 + +; Note that the results of all division operations are floored. + +; Calculate (MaxHP * 255) / BallFactor. ld [H_DIVISOR],a - ld b,4 ; number of bytes in dividend + ld b,4 ; number of bytes in dividend call Divide + +; Divide the enemy's current HP by 4. HP is not supposed to exceed 999 so +; the result should fit in a. If the division results in a quotient of 0, +; change it to 1. ld hl,wEnemyMonHP ld a,[hli] ld b,a ld a,[hl] - -; explanation: we have a 16-bit value equal to [b << 8 | a]. -; This number is divided by 4. The result is 8 bit (reg. a). -; Always bigger than zero. srl b rr a srl b - rr a ; a = current HP / 4 + rr a and a jr nz,.next8 inc a + .next8 + +; Let W = ((MaxHP * 255) / BallFactor) / max(HP / 4, 1). Calculate W. ld [H_DIVISOR],a ld b,4 - call Divide ; ((MaxHP * 255) / BallFactor) / (CurHP / 4) + call Divide + +; If W > 255, store 255 in [H_QUOTIENT + 3]. +; Let X = min(W, 255) = [H_QUOTIENT + 3]. ld a,[H_QUOTIENT + 2] and a jr z,.next9 ld a,255 ld [H_QUOTIENT + 3],a + .next9 - pop bc - ld a,[wEnemyMonCatchRate] ;enemy: Catch Rate + pop bc ; b = Rand1 - Status + +; If Rand1 - Status > CatchRate, the ball fails to capture the Pokémon. + ld a,[wEnemyMonCatchRate] cp b - jr c,.next10 + jr c,.failedToCapture + +; If W > 255, the ball captures the Pokémon. ld a,[H_QUOTIENT + 2] and a - jr nz,.BallSuccess ; if ((MaxHP * 255) / BallFactor) / (CurHP / 4) > 0x255, automatic success - call Random + jr nz,.captured + + call Random ; Let this random number be called Rand2. + +; If Rand2 > X, the ball fails to capture the Pokémon. ld b,a ld a,[H_QUOTIENT + 3] cp b - jr c,.next10 -.BallSuccess - jr .BallSuccess2 -.next10 + jr c,.failedToCapture + +.captured + jr .skipShakeCalculations + +.failedToCapture ld a,[H_QUOTIENT + 3] - ld [wd11e],a + ld [wPokeBallCaptureCalcTemp],a ; Save X. + +; Calculate CatchRate * 100. xor a ld [H_MULTIPLICAND],a ld [H_MULTIPLICAND + 1],a - ld a,[wEnemyMonCatchRate] ;enemy: Catch Rate + ld a,[wEnemyMonCatchRate] ld [H_MULTIPLICAND + 2],a ld a,100 ld [H_MULTIPLIER],a - call Multiply ; CatchRate * 100 + call Multiply + +; Determine BallFactor2. +; Poké Ball: BallFactor2 = 255 +; Great Ball: BallFactor2 = 200 +; Ultra/Safari Ball: BallFactor2 = 150 ld a,[wcf91] ld b,255 cp a,POKE_BALL @@ -271,51 +348,82 @@ ItemUseBall: ; d687 (3:5687) ld b,150 cp a,ULTRA_BALL jr z,.next11 + .next11 + +; Let Y = (CatchRate * 100) / BallFactor2. Calculate Y. ld a,b ld [H_DIVISOR],a ld b,4 call Divide + +; If Y > 255, there are 3 shakes. +; Note that this shouldn't be possible. +; The maximum value of Y is (255 * 100) / 150 = 170. ld a,[H_QUOTIENT + 2] and a - ld b,$63 - jr nz,.next12 - ld a,[wd11e] + ld b,$63 ; 3 shakes + jr nz,.setAnimData + +; Calculate X * Y. + ld a,[wPokeBallCaptureCalcTemp] ld [H_MULTIPLIER],a call Multiply + +; Calculate (X * Y) / 255. ld a,255 ld [H_DIVISOR],a ld b,4 call Divide - ld a,[wEnemyMonStatus] ;status ailments + +; Determine Status2. +; no status ailment: Status2 = 0 +; Burn/Paralysis/Poison: Status2 = 5 +; Freeze/Sleep: Status2 = 10 +; Let Z = ((X * Y) / 255) + Status2. + ld a,[wEnemyMonStatus] and a jr z,.next13 and a, 1 << FRZ | SLP ld b,5 jr z,.next14 ld b,10 + .next14 +; If the Pokémon has a status ailment, add Status2. ld a,[H_QUOTIENT + 3] add b ld [H_QUOTIENT + 3],a + .next13 +; Finally determine the number of shakes. +; The number of shakes depend on the range Z is in. +; 0 ≤ Z < 10: 0 shakes (the ball misses) +; 10 ≤ Z < 30: 1 shake +; 30 ≤ Z < 70: 2 shakes +; 70 ≤ Z: 3 shakes ld a,[H_QUOTIENT + 3] cp a,10 ld b,$20 - jr c,.next12 + jr c,.setAnimData cp a,30 ld b,$61 - jr c,.next12 + jr c,.setAnimData cp a,70 ld b,$62 - jr c,.next12 + jr c,.setAnimData ld b,$63 -.next12 + +.setAnimData ld a,b ld [wPokeBallAnimData],a -.BallSuccess2 + +.skipShakeCalculations + ld c,20 call DelayFrames + +; Do the animation. ld a,TOSS_ANIM ld [W_ANIMATIONID],a xor a @@ -331,44 +439,60 @@ ItemUseBall: ; d687 (3:5687) ld [wcf91],a pop af ld [wWhichPokemon],a + +; Determine the message to display from the animation. ld a,[wPokeBallAnimData] cp a,$10 ld hl,ItemUseBallText00 - jp z,.printText0 + jp z,.printMessage cp a,$20 ld hl,ItemUseBallText01 - jp z,.printText0 + jp z,.printMessage cp a,$61 ld hl,ItemUseBallText02 - jp z,.printText0 + jp z,.printMessage cp a,$62 ld hl,ItemUseBallText03 - jp z,.printText0 + jp z,.printMessage cp a,$63 ld hl,ItemUseBallText04 - jp z,.printText0 - ld hl,wEnemyMonHP ;current HP + jp z,.printMessage + +; Save current HP. + ld hl,wEnemyMonHP ld a,[hli] push af ld a,[hli] - push af ;backup currentHP... + push af + +; Save status ailment. inc hl ld a,[hl] - push af ;...and status ailments + push af + push hl + +; If the Pokémon is transformed, the Pokémon is assumed to be a Ditto. +; This is a bug because a wild Pokémon could have used Transform via +; Mirror Move even though the only wild Pokémon that knows Transform is Ditto. ld hl,W_ENEMYBATTSTATUS3 bit Transformed,[hl] - jr z,.next15 - ld a,$4c + jr z,.notTransformed + ld a,DITTO ld [wEnemyMonSpecies2],a jr .next16 -.next15 + +.notTransformed +; If the Pokémon is not transformed, set the transformed bit and copy the +; DVs to wTransformedEnemyMonOriginalDVs so that LoadEnemyMonData won't generate +; new DVs. set Transformed,[hl] ld hl,wTransformedEnemyMonOriginalDVs ld a,[wEnemyMonDVs] ld [hli],a ld a,[wEnemyMonDVs + 1] ld [hl],a + .next16 ld a,[wcf91] push af @@ -387,15 +511,18 @@ ItemUseBall: ; d687 (3:5687) ld [hld],a pop af ld [hl],a - ld a,[wEnemyMonSpecies] ;enemy + ld a,[wEnemyMonSpecies] ld [wCapturedMonSpecies],a ld [wcf91],a ld [wd11e],a ld a,[W_BATTLETYPE] - dec a - jr z,.printText1 + dec a ; is this the old man battle? + jr z,.oldManCaughtMon ; if so, don't give the player the caught Pokémon + ld hl,ItemUseBallText05 call PrintText + +; Add the caught Pokémon to the Pokédex. predef IndexToPokedex ld a,[wd11e] dec a @@ -411,46 +538,56 @@ ItemUseBall: ; d687 (3:5687) ld b,FLAG_SET predef FlagActionPredef pop af - and a - jr nz,.checkParty + + and a ; was the Pokémon already in the Pokédex? + jr nz,.skipShowingPokedexData ; if so, don't show the Pokédex data + ld hl,ItemUseBallText06 call PrintText call ClearSprites - ld a,[wEnemyMonSpecies] ;caught mon_ID + ld a,[wEnemyMonSpecies] ld [wd11e],a predef ShowPokedexData -.checkParty + +.skipShowingPokedexData ld a,[wPartyCount] - cp a,PARTY_LENGTH ;is party full? + cp a,PARTY_LENGTH ; is party full? jr z,.sendToBox xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation],a call ClearSprites - call AddPartyMon ;add mon to Party - jr .End + call AddPartyMon + jr .done + .sendToBox call ClearSprites call SendNewMonToBox ld hl,ItemUseBallText07 CheckEvent EVENT_MET_BILL - jr nz,.sendToBox2 + jr nz,.printTransferredToPCText ld hl,ItemUseBallText08 -.sendToBox2 +.printTransferredToPCText call PrintText - jr .End -.printText1 + jr .done + +.oldManCaughtMon ld hl,ItemUseBallText05 -.printText0 + +.printMessage call PrintText call ClearSprites -.End + +.done ld a,[W_BATTLETYPE] - and a - ret nz + and a ; is this the old man battle? + ret nz ; if so, don't remove a ball from the bag + +; Remove a ball from the bag. ld hl,wNumBagItems inc a ld [wItemQuantity],a jp RemoveItemFromInventory + ItemUseBallText00: ; d937 (3:5937) ;"It dodged the thrown ball!" ;"This pokemon can't be caught" diff --git a/engine/town_map.asm b/engine/town_map.asm index 225de2b8..8bf11358 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -444,8 +444,12 @@ WritePlayerOrBirdSpriteOAM: ; 7126d (1c:526d) WriteTownMapSpriteOAM: ; 71279 (1c:5279) push hl + +; Subtract 4 from c (X coord) and 4 from b (Y coord). However, the carry from c +; is added to b, so the net result is that only 3 is subtracted from b. lb hl, -4, -4 - add hl, bc ; subtract 4 from c (X coord) and 4 from b (Y coord) + add hl, bc + ld b, h ld c, l pop hl @@ -469,14 +473,14 @@ WriteAsymmetricMonPartySpriteOAM: ; 71281 (1c:5281) xor a ld [hli], a inc d - ld a, $8 + ld a, 8 add c ld c, a dec e jr nz, .innerLoop pop bc pop de - ld a, $8 + ld a, 8 add b ld b, a dec d diff --git a/home.asm b/home.asm index 0d7c5271..c0e51b58 100644 --- a/home.asm +++ b/home.asm @@ -3167,7 +3167,7 @@ SaveScreenTilesToBuffer2:: ; 36f4 (0:36f4) LoadScreenTilesFromBuffer2:: ; 3701 (0:3701) call LoadScreenTilesFromBuffer2DisableBGTransfer - ld a, $1 + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a ret @@ -3177,7 +3177,7 @@ LoadScreenTilesFromBuffer2DisableBGTransfer:: ; 3709 (0:3709) ld [H_AUTOBGTRANSFERENABLED], a ld hl, wTileMapBackup2 coord de, 0, 0 - ld bc, $168 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyData ret @@ -3194,7 +3194,7 @@ LoadScreenTilesFromBuffer1:: ; 3725 (0:3725) coord de, 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyData - ld a, $1 + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a ret diff --git a/wram.asm b/wram.asm index acf75346..c5810856 100755 --- a/wram.asm +++ b/wram.asm @@ -2073,6 +2073,8 @@ wFirstMonsNotOutYet:: ; d11d ; which will be the first mon sent out. ds 1 +wPokeBallCaptureCalcTemp:: ; d11e + ; lower nybble: number of shakes ; upper nybble: number of animations to play wPokeBallAnimData:: ; d11e -- cgit v1.3.1-sl0p From 30063216cdf85dc069c9e0162195cede7d24d4a4 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Aug 2015 23:35:58 -0700 Subject: use the new battle type constants --- engine/battle/core.asm | 20 ++++++++++---------- engine/battle/init_battle_variables.asm | 2 +- scripts/viridiancity.asm | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 0b534dda..a00d15bb 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1584,7 +1584,7 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) call IsGhostBattle jp z, .canEscape ; jump if it's a ghost battle ld a, [W_BATTLETYPE] - cp $2 + cp BATTLE_TYPE_SAFARI jp z, .canEscape ; jump if it's a safari battle ld a, [wLinkState] cp LINK_STATE_BATTLING @@ -2094,7 +2094,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) call SaveScreenTilesToBuffer1 .nonstandardbattle ld a, [W_BATTLETYPE] - cp $2 ; safari + cp BATTLE_TYPE_SAFARI ld a, BATTLE_MENU_TEMPLATE jr nz, .menuselected ld a, SAFARI_BATTLE_MENU_TEMPLATE @@ -2144,7 +2144,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) jr .rightColumn .leftColumn ; put cursor in left column of menu ld a, [W_BATTLETYPE] - cp $2 + cp BATTLE_TYPE_SAFARI ld a, " " jr z, .safariLeftColumn ; put cursor in left column for normal battle menu (i.e. when it's not a Safari battle) @@ -2177,7 +2177,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) jr .AButtonPressed ; the A button was pressed .rightColumn ; put cursor in right column of menu ld a, [W_BATTLETYPE] - cp $2 + cp BATTLE_TYPE_SAFARI ld a, " " jr z, .safariRightColumn ; put cursor in right column for normal battle menu (i.e. when it's not a Safari battle) @@ -2214,7 +2214,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) .AButtonPressed call PlaceUnfilledArrowMenuCursor ld a, [W_BATTLETYPE] - cp $2 ; is it a Safari battle? + cp BATTLE_TYPE_SAFARI ld a, [wCurrentMenuItem] ld [wBattleAndStartSavedMenuItem], a jr z, .handleMenuSelection @@ -2236,7 +2236,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) jr nz, .upperLeftMenuItemWasNotSelected ; the upper left menu item was selected ld a, [W_BATTLETYPE] - cp $2 + cp BATTLE_TYPE_SAFARI jr z, .throwSafariBallWasSelected ; the "FIGHT" menu was selected xor a @@ -2264,7 +2264,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) .notLinkBattle call SaveScreenTilesToBuffer2 ld a, [W_BATTLETYPE] - cp $2 ; is it a safari battle? + cp BATTLE_TYPE_SAFARI jr nz, BagWasSelected ; bait was selected @@ -2333,7 +2333,7 @@ UseBagItem: xor a ld [wCurrentMenuItem], a ld a, [W_BATTLETYPE] - cp $2 ; is it a safari battle? + cp BATTLE_TYPE_SAFARI jr z, .checkIfMonCaptured ld a, [wActionResultOrTookBattleTurn] @@ -2355,7 +2355,7 @@ UseBagItem: jr nz, .returnAfterCapturingMon ld a, [W_BATTLETYPE] - cp $2 ; is it a safari battle? + cp BATTLE_TYPE_SAFARI jr z, .returnAfterUsingItem_NoCapture ; not a safari battle call LoadScreenTilesFromBuffer1 @@ -2386,7 +2386,7 @@ PartyMenuOrRockOrRun: ; party menu or rock was selected call SaveScreenTilesToBuffer2 ld a, [W_BATTLETYPE] - cp $2 ; is it a safari battle? + cp BATTLE_TYPE_SAFARI jr nz, .partyMenuWasSelected ; safari battle ld a, SAFARI_ROCK diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 6a4cd771..5791730c 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -32,7 +32,7 @@ InitBattleVariables: ; 525af (14:65af) jr c, .notSafariBattle cp SAFARI_ZONE_REST_HOUSE_1 jr nc, .notSafariBattle - ld a, $2 ; safari battle + ld a, BATTLE_TYPE_SAFARI ld [W_BATTLETYPE], a .notSafariBattle jpab PlayBattleMusic diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index 79ad444f..ae0b6212 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -71,7 +71,7 @@ ViridianCityScript1: ; 19062 (6:5062) ld [wListScrollOffset], a ; set up battle for Old Man - ld a, $1 + ld a, BATTLE_TYPE_OLD_MAN ld [W_BATTLETYPE], a ld a, 5 ld [W_CURENEMYLVL], a -- cgit v1.3.1-sl0p From 4f43e47fc9a343b973ed3b60d6ec34c3b9f97fa8 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 30 Aug 2015 00:15:59 -0700 Subject: rename ItemUseBall labels --- engine/items/items.asm | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/engine/items/items.asm b/engine/items/items.asm index 7965bc8f..ade5b7fd 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -163,7 +163,6 @@ ItemUseBall: ; d687 (3:5687) jp .captured .notOldManBattle - ; If the player is fighting the ghost Marowak, set the value that indicates the ; Pokémon can't be caught and skip the capture calculations. ld a,[W_CURMAP] @@ -254,11 +253,10 @@ ItemUseBall: ; d687 (3:5687) ld a,[wcf91] cp a,GREAT_BALL ld a,12 - jr nz,.next7 + jr nz,.skip1 ld a,8 -.next7 - +.skip1 ; Note that the results of all division operations are floored. ; Calculate (MaxHP * 255) / BallFactor. @@ -278,11 +276,10 @@ ItemUseBall: ; d687 (3:5687) srl b rr a and a - jr nz,.next8 + jr nz,.skip2 inc a -.next8 - +.skip2 ; Let W = ((MaxHP * 255) / BallFactor) / max(HP / 4, 1). Calculate W. ld [H_DIVISOR],a ld b,4 @@ -292,11 +289,11 @@ ItemUseBall: ; d687 (3:5687) ; Let X = min(W, 255) = [H_QUOTIENT + 3]. ld a,[H_QUOTIENT + 2] and a - jr z,.next9 + jr z,.skip3 ld a,255 ld [H_QUOTIENT + 3],a -.next9 +.skip3 pop bc ; b = Rand1 - Status ; If Rand1 - Status > CatchRate, the ball fails to capture the Pokémon. @@ -341,16 +338,15 @@ ItemUseBall: ; d687 (3:5687) ld a,[wcf91] ld b,255 cp a,POKE_BALL - jr z,.next11 + jr z,.skip4 ld b,200 cp a,GREAT_BALL - jr z,.next11 + jr z,.skip4 ld b,150 cp a,ULTRA_BALL - jr z,.next11 - -.next11 + jr z,.skip4 +.skip4 ; Let Y = (CatchRate * 100) / BallFactor2. Calculate Y. ld a,b ld [H_DIVISOR],a @@ -380,23 +376,23 @@ ItemUseBall: ; d687 (3:5687) ; no status ailment: Status2 = 0 ; Burn/Paralysis/Poison: Status2 = 5 ; Freeze/Sleep: Status2 = 10 -; Let Z = ((X * Y) / 255) + Status2. ld a,[wEnemyMonStatus] and a - jr z,.next13 + jr z,.skip5 and a, 1 << FRZ | SLP ld b,5 - jr z,.next14 + jr z,.addAilmentValue ld b,10 -.next14 +.addAilmentValue ; If the Pokémon has a status ailment, add Status2. ld a,[H_QUOTIENT + 3] add b ld [H_QUOTIENT + 3],a -.next13 +.skip5 ; Finally determine the number of shakes. +; Let Z = ((X * Y) / 255) + Status2 = [H_QUOTIENT + 3]. ; The number of shakes depend on the range Z is in. ; 0 ≤ Z < 10: 0 shakes (the ball misses) ; 10 ≤ Z < 30: 1 shake @@ -419,7 +415,6 @@ ItemUseBall: ; d687 (3:5687) ld [wPokeBallAnimData],a .skipShakeCalculations - ld c,20 call DelayFrames @@ -480,7 +475,7 @@ ItemUseBall: ; d687 (3:5687) jr z,.notTransformed ld a,DITTO ld [wEnemyMonSpecies2],a - jr .next16 + jr .skip6 .notTransformed ; If the Pokémon is not transformed, set the transformed bit and copy the @@ -493,7 +488,7 @@ ItemUseBall: ; d687 (3:5687) ld a,[wEnemyMonDVs + 1] ld [hl],a -.next16 +.skip6 ld a,[wcf91] push af ld a,[wEnemyMonSpecies2] -- cgit v1.3.1-sl0p From 4cfcc2f589d07e0b038a0ca4b31123152b93dbe1 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 30 Aug 2015 00:44:13 -0700 Subject: replaced hardcoded values in ItemUseMedicine --- engine/items/items.asm | 44 ++++++++++++++++++++++---------------------- wram.asm | 1 + 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/engine/items/items.asm b/engine/items/items.asm index ade5b7fd..1d2001f0 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -901,10 +901,10 @@ ItemUseMedicine: ; dabb (3:5abb) ld hl,W_PLAYERBATTSTATUS3 res BadlyPoisoned,[hl] ; heal Toxic status pop hl - ld bc,30 + ld bc,wPartyMon1Stats - wPartyMon1Status add hl,bc ; hl now points to party stats - ld de,wBattleMonMaxHP - ld bc,10 + ld de,wBattleMonStats + ld bc,NUM_STATS * 2 call CopyData ; copy party stats to in-battle stat data predef DoubleOrHalveSelectedStats jp .doneHealing @@ -959,7 +959,7 @@ ItemUseMedicine: ; dabb (3:5abb) .compareCurrentHPToMaxHP push hl push bc - ld bc,32 + ld bc,wPartyMon1MaxHP - (wPartyMon1HP + 1) add hl,bc ; hl now points to max HP pop bc ld a,[hli] @@ -991,7 +991,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [wChannelSoundIDs + CH4],a push hl push de - ld bc,32 + ld bc,wPartyMon1MaxHP - (wPartyMon1HP + 1) add hl,bc ; hl now points to max HP ld a,[hli] ld [wHPBarMaxHP+1],a @@ -1024,7 +1024,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [H_DIVISOR],a ld b,2 ; number of bytes call Divide ; get 1/5 of max HP of pokemon that used Softboiled - ld bc,wPartyMon1HP - wPartyMon1MaxHP + ld bc,(wPartyMon1HP + 1) - (wPartyMon1MaxHP + 1) add hl,bc ; hl now points to LSB of current HP of pokemon that used Softboiled ; subtract 1/5 of max HP from current HP of pokemon that used Softboiled ld a,[H_QUOTIENT + 3] @@ -1103,7 +1103,7 @@ ItemUseMedicine: ; dabb (3:5abb) inc hl ld d,h ld e,l ; de now points to current HP - ld hl,33 + ld hl,(wPartyMon1MaxHP + 1) - (wPartyMon1HP + 1) add hl,de ; hl now points to max HP ld a,[wcf91] cp a,REVIVE @@ -1150,7 +1150,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld a,[wcf91] cp a,FULL_RESTORE jr nz,.updateInBattleData - ld bc,-31 + ld bc,wPartyMon1Status - (wPartyMon1MaxHP + 1) add hl,bc xor a ld [hl],a ; remove the status ailment in the party data @@ -1173,7 +1173,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [wBattleMonStatus],a ; remove the status ailment in the in-battle pokemon data .calculateHPBarCoords ld hl,wOAMBuffer + $90 - ld bc,2 * 20 + ld bc,2 * SCREEN_WIDTH inc d .calculateHPBarCoordsLoop add hl,bc @@ -1253,7 +1253,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld a,[hl] ld [wd0b5],a ld [wd11e],a - ld bc,33 + ld bc,wPartyMon1Level - wPartyMon1 add hl,bc ; hl now points to level ld a,[hl] ; a = level ld [W_CURENEMYLVL],a ; store level @@ -1270,7 +1270,7 @@ ItemUseMedicine: ; dabb (3:5abb) push hl sub a,HP_UP add a - ld bc,17 + ld bc,wPartyMon1HPExp - wPartyMon1 add hl,bc add l ld l,a @@ -1318,17 +1318,17 @@ ItemUseMedicine: ; dabb (3:5abb) call PrintText jp GBPalWhiteOut .recalculateStats - ld bc,34 + ld bc,wPartyMon1Stats - wPartyMon1 add hl,bc ld d,h ld e,l ; de now points to stats - ld bc,-18 - add hl,bc ; hl now points to byte 3 of experience + ld bc,(wPartyMon1Exp + 2) - wPartyMon1Stats + add hl,bc ; hl now points to LSB of experience ld b,1 jp CalcStats ; recalculate stats .useRareCandy push hl - ld bc,33 + ld bc,wPartyMon1Level - wPartyMon1 add hl,bc ; hl now points to level ld a,[hl] ; a = level cp a, MAX_LEVEL @@ -1342,8 +1342,8 @@ ItemUseMedicine: ; dabb (3:5abb) callab CalcExperience ; calculate experience for next level and store it at $ff96 pop de pop hl - ld bc,-19 - add hl,bc ; hl now points to experience + ld bc,wPartyMon1Exp - wPartyMon1Level + add hl,bc ; hl now points to MSB of experience ; update experience to minimum for new level ld a,[hExperience] ld [hli],a @@ -1358,7 +1358,7 @@ ItemUseMedicine: ; dabb (3:5abb) push af push de push hl - ld bc,34 + ld bc,wPartyMon1MaxHP - wPartyMon1 add hl,bc ; hl now points to MSB of max HP ld a,[hli] ld b,a @@ -1368,8 +1368,8 @@ ItemUseMedicine: ; dabb (3:5abb) push hl call .recalculateStats pop hl - ld bc,35 ; hl now points to LSB of max HP - add hl,bc + ld bc,(wPartyMon1MaxHP + 1) - wPartyMon1 + add hl,bc ; hl now points to LSB of max HP pop bc ld a,[hld] sub c @@ -1378,8 +1378,8 @@ ItemUseMedicine: ; dabb (3:5abb) sbc b ld b,a ; bc = the amount of max HP gained from leveling up ; add the amount gained to the current HP - ld de,-32 - add hl,de ; hl now points to MSB of current HP + ld de,(wPartyMon1HP + 1) - wPartyMon1MaxHP + add hl,de ; hl now points to LSB of current HP ld a,[hl] add c ld [hld],a diff --git a/wram.asm b/wram.asm index c5810856..15987dda 100755 --- a/wram.asm +++ b/wram.asm @@ -50,6 +50,7 @@ battle_struct: MACRO \1Moves:: ds NUM_MOVES \1DVs:: ds 2 \1Level:: db +\1Stats:: \1MaxHP:: dw \1Attack:: dw \1Defense:: dw -- cgit v1.3.1-sl0p From 38065a744de1065cc021a4cafe22476f8425448d Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 30 Aug 2015 21:38:41 -0500 Subject: No more W_ --- audio.asm | 4 +- constants/hide_show_constants.asm | 2 +- constants/wram_constants.asm | 4 +- data/hide_show_data.asm | 2 +- data/trainer_moves.asm | 4 +- engine/battle/animations.asm | 230 +++--- engine/battle/battle_transitions.asm | 10 +- engine/battle/common_text.asm | 6 +- engine/battle/core.asm | 786 ++++++++++----------- engine/battle/decrement_pp.asm | 8 +- engine/battle/draw_hud_pokeball_gfx.asm | 18 +- engine/battle/end_of_battle.asm | 8 +- engine/battle/experience.asm | 10 +- engine/battle/get_trainer_name.asm | 8 +- engine/battle/ghost_marowak_anim.asm | 12 +- engine/battle/init_battle_variables.asm | 4 +- engine/battle/moveEffects/conversion_effect.asm | 4 +- engine/battle/moveEffects/drain_hp_effect.asm | 10 +- engine/battle/moveEffects/focus_energy_effect.asm | 4 +- engine/battle/moveEffects/haze_effect.asm | 8 +- engine/battle/moveEffects/heal_effect.asm | 4 +- engine/battle/moveEffects/leech_seed_effect.asm | 6 +- engine/battle/moveEffects/mist_effect.asm | 4 +- engine/battle/moveEffects/one_hit_ko_effect.asm | 6 +- engine/battle/moveEffects/paralyze_effect.asm | 6 +- engine/battle/moveEffects/recoil_effect.asm | 8 +- .../moveEffects/reflect_light_screen_effect.asm | 8 +- engine/battle/moveEffects/substitute_effect.asm | 6 +- engine/battle/moveEffects/transform_effect.asm | 14 +- engine/battle/print_type.asm | 8 +- engine/battle/read_trainer_party.asm | 22 +- engine/battle/safari_zone.asm | 2 +- engine/battle/save_trainer_name.asm | 54 +- engine/battle/trainer_ai.asm | 34 +- engine/battle/wild_encounters.asm | 16 +- engine/cable_club.asm | 22 +- engine/evos_moves.asm | 18 +- engine/experience.asm | 2 +- engine/give_pokemon.asm | 4 +- engine/hall_of_fame.asm | 6 +- engine/hidden_object_functions18.asm | 4 +- engine/hidden_object_functions3.asm | 6 +- engine/hidden_object_functions7.asm | 6 +- engine/in_game_trades.asm | 6 +- engine/intro.asm | 26 +- engine/items/itemfinder.asm | 10 +- engine/items/items.asm | 138 ++-- engine/items/tms.asm | 2 +- engine/learn_move.asm | 2 +- engine/menu/bills_pc.asm | 14 +- engine/menu/league_pc.asm | 2 +- engine/menu/main_menu.asm | 14 +- engine/menu/naming_screen.asm | 6 +- engine/menu/prize_menu.asm | 18 +- engine/menu/start_sub_menus.asm | 6 +- engine/menu/status_screen.asm | 10 +- engine/oak_speech.asm | 6 +- engine/oak_speech2.asm | 4 +- engine/overworld/card_key.asm | 10 +- engine/overworld/cinnabar_lab.asm | 10 +- engine/overworld/cut.asm | 12 +- engine/overworld/doors.asm | 2 +- engine/overworld/hidden_items.asm | 2 +- engine/overworld/hidden_objects.asm | 14 +- engine/overworld/is_player_just_outside_map.asm | 8 +- engine/overworld/item.asm | 4 +- engine/overworld/ledges.asm | 2 +- engine/overworld/map_sprites.asm | 28 +- engine/overworld/movement.asm | 18 +- engine/overworld/npc_movement.asm | 6 +- engine/overworld/pewter_guys.asm | 4 +- engine/overworld/player_animations.asm | 4 +- engine/overworld/trainers.asm | 2 +- engine/palettes.asm | 10 +- engine/play_time.asm | 26 +- engine/predefs17_2.asm | 4 +- engine/save.asm | 6 +- engine/slot_machine.asm | 20 +- engine/titlescreen.asm | 2 +- engine/town_map.asm | 10 +- engine/trade.asm | 24 +- home.asm | 128 ++-- home/overworld.asm | 228 +++--- home/pic.asm | 218 +++--- home/text.asm | 2 +- main.asm | 176 ++--- scripts/agatha.asm | 22 +- scripts/billshouse.asm | 14 +- scripts/blueshouse.asm | 4 +- scripts/bruno.asm | 20 +- scripts/celadongamecorner.asm | 18 +- scripts/celadongym.asm | 18 +- scripts/ceruleancity.asm | 30 +- scripts/ceruleangym.asm | 16 +- scripts/cinnabargym.asm | 26 +- scripts/cinnabarisland.asm | 10 +- scripts/daycarem.asm | 8 +- scripts/fightingdojo.asm | 22 +- scripts/fuchsiagym.asm | 16 +- scripts/gary.asm | 36 +- scripts/halloffameroom.asm | 18 +- scripts/lab4.asm | 2 +- scripts/lance.asm | 16 +- scripts/lorelei.asm | 20 +- scripts/mansion1.asm | 4 +- scripts/mansion2.asm | 4 +- scripts/mansion3.asm | 4 +- scripts/mansion4.asm | 4 +- scripts/mtmoon1.asm | 4 +- scripts/mtmoon3.asm | 38 +- scripts/museum1f.asm | 16 +- scripts/oakslab.asm | 82 +-- scripts/pallettown.asm | 16 +- scripts/pewtercity.asm | 20 +- scripts/pewtergym.asm | 18 +- scripts/pokemontower2.asm | 26 +- scripts/pokemontower3.asm | 4 +- scripts/pokemontower4.asm | 4 +- scripts/pokemontower5.asm | 4 +- scripts/pokemontower6.asm | 30 +- scripts/pokemontower7.asm | 32 +- scripts/powerplant.asm | 8 +- scripts/redshouse2f.asm | 4 +- scripts/rockethideout1.asm | 4 +- scripts/rockethideout2.asm | 14 +- scripts/rockethideout3.asm | 12 +- scripts/rockethideout4.asm | 18 +- scripts/rocktunnel1.asm | 4 +- scripts/rocktunnel2.asm | 4 +- scripts/route10.asm | 4 +- scripts/route11.asm | 4 +- scripts/route12.asm | 22 +- scripts/route13.asm | 4 +- scripts/route14.asm | 4 +- scripts/route15.asm | 4 +- scripts/route16.asm | 22 +- scripts/route16gate.asm | 10 +- scripts/route17.asm | 4 +- scripts/route18.asm | 4 +- scripts/route18gate.asm | 10 +- scripts/route19.asm | 4 +- scripts/route20.asm | 4 +- scripts/route21.asm | 4 +- scripts/route22.asm | 32 +- scripts/route22gate.asm | 10 +- scripts/route23.asm | 14 +- scripts/route24.asm | 26 +- scripts/route25.asm | 4 +- scripts/route3.asm | 4 +- scripts/route4.asm | 4 +- scripts/route5gate.asm | 8 +- scripts/route6.asm | 4 +- scripts/route6gate.asm | 6 +- scripts/route7gate.asm | 8 +- scripts/route8.asm | 4 +- scripts/route8gate.asm | 6 +- scripts/route9.asm | 4 +- scripts/safarizoneentrance-yellow.asm | 6 +- scripts/safarizoneentrance.asm | 24 +- scripts/saffrongym.asm | 16 +- scripts/seafoamislands4.asm | 20 +- scripts/seafoamislands5.asm | 20 +- scripts/silphco10.asm | 4 +- scripts/silphco11.asm | 10 +- scripts/silphco2.asm | 4 +- scripts/silphco3.asm | 4 +- scripts/silphco4.asm | 4 +- scripts/silphco5.asm | 4 +- scripts/silphco6.asm | 4 +- scripts/silphco7.asm | 16 +- scripts/silphco8.asm | 4 +- scripts/silphco9.asm | 4 +- scripts/ssanne10.asm | 4 +- scripts/ssanne2.asm | 24 +- scripts/ssanne5.asm | 4 +- scripts/ssanne8.asm | 4 +- scripts/ssanne9.asm | 4 +- scripts/unknowndungeon3.asm | 4 +- scripts/vermilioncity.asm | 16 +- scripts/vermiliongym.asm | 18 +- scripts/victoryroad1.asm | 4 +- scripts/victoryroad2.asm | 4 +- scripts/victoryroad3.asm | 4 +- scripts/viridiancity.asm | 36 +- scripts/viridianforest.asm | 4 +- scripts/viridiangym.asm | 24 +- scripts/viridianmart.asm | 10 +- text.asm | 26 +- text/maps/daycare_1.asm | 2 +- wram.asm | 484 ++++++------- 190 files changed, 2202 insertions(+), 2202 deletions(-) diff --git a/audio.asm b/audio.asm index 55bf4a1b..7e28b136 100644 --- a/audio.asm +++ b/audio.asm @@ -371,13 +371,13 @@ PlayBattleMusic:: ; 0x90c6 call PlaySound ; stop music call DelayFrame ld c, BANK(Music_GymLeaderBattle) - ld a, [W_GYMLEADERNO] + ld a, [wGymLeaderNo] and a jr z, .notGymLeaderBattle ld a, MUSIC_GYM_LEADER_BATTLE jr .playSong .notGymLeaderBattle - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] cp 200 jr c, .wildBattle cp OPP_SONY3 diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 5a517afc..1a44b1e7 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -2,7 +2,7 @@ ; sprites marked with an X are constants that are never used ; because those sprites are not (de)activated in a map's script ; (they are either items or sprites that deactivate after battle -; and are detected in W_MISSABLEOBJECTLIST) +; and are detected in wMissableObjectList) const_value = 0 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 067c8707..b6939a3e 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -1,8 +1,8 @@ SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile) -; Overload W_GRASSMONS -wSerialEnemyDataBlock EQU $d893 ; W_GRASSMONS + 11 +; Overload wGrassMons +wSerialEnemyDataBlock EQU $d893 ; wGrassMons + 11 ; Overload enemy party data W_WATERRATE EQU $d8a4 ; wEnemyMon1Species diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index c8d89102..4fe57b20 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -263,7 +263,7 @@ MapHSPointers: ; c8f5 (3:48f5) ; a) Map_ID = $FF ; b) Map_ID ≠ currentMapID ; -; This Data is loaded into RAM at wd5ce-$D5F?. (W_MISSABLEOBJECTLIST) +; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList) ; These constants come from the bytes for Predef functions: Hide equ $11 diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm index 432f0fed..8fbb0069 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -1,8 +1,8 @@ IF !DEF(YELLOW) LoneMoves: ; 39d22 (e:5d22) ; these are used for gym leaders. -; this is not automatic! you have to write the number you want to W_LONEATTACKNO -; first. e.g., erika's script writes 4 to W_LONEATTACKNO to get mega drain, +; this is not automatic! you have to write the number you want to wLoneAttackNo +; first. e.g., erika's script writes 4 to wLoneAttackNo to get mega drain, ; the fourth entry in the list. ; first byte: pokemon in the trainer's party that gets the move diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 6d0f0e5f..31b490f3 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -4,18 +4,18 @@ DrawFrameBlock: ; 78000 (1e:4000) ld l,c ld h,b ld a,[hli] - ld [W_NUMFBTILES],a - ld a,[W_FBDESTADDR + 1] + ld [wNumFBTiles],a + ld a,[wFBDestAddr + 1] ld e,a - ld a,[W_FBDESTADDR] + ld a,[wFBDestAddr] ld d,a xor a - ld [W_FBTILECOUNTER],a ; loop counter + ld [wFBTileCounter],a ; loop counter .loop - ld a,[W_FBTILECOUNTER] + ld a,[wFBTileCounter] inc a - ld [W_FBTILECOUNTER],a - ld a,[W_SUBANIMTRANSFORM] + ld [wFBTileCounter],a + ld a,[wSubAnimTransform] dec a jr z,.flipHorizontalAndVertical ; 1 dec a @@ -23,15 +23,15 @@ DrawFrameBlock: ; 78000 (1e:4000) dec a jr z,.flipBaseCoords ; 3 .noTransformation - ld a,[W_BASECOORDY] + ld a,[wBaseCoordY] add [hl] ld [de],a ; store Y inc hl inc de - ld a,[W_BASECOORDX] + ld a,[wBaseCoordX] jr .finishCopying .flipBaseCoords - ld a,[W_BASECOORDY] + ld a,[wBaseCoordY] ld b,a ld a,136 sub b ; flip Y base coordinate @@ -39,11 +39,11 @@ DrawFrameBlock: ; 78000 (1e:4000) ld [de],a ; store Y inc hl inc de - ld a,[W_BASECOORDX] + ld a,[wBaseCoordX] ld b,a ld a,168 sub b ; flip X base coordinate -.finishCopying ; finish copying values to OAM (when [W_SUBANIMTRANSFORM] not 1 or 2) +.finishCopying ; finish copying values to OAM (when [wSubAnimTransform] not 1 or 2) add [hl] ; X offset ld [de],a ; store X inc hl @@ -57,7 +57,7 @@ DrawFrameBlock: ; 78000 (1e:4000) inc de jp .nextTile .flipHorizontalAndVertical - ld a,[W_BASECOORDY] + ld a,[wBaseCoordY] add [hl] ; Y offset ld b,a ld a,136 @@ -65,7 +65,7 @@ DrawFrameBlock: ; 78000 (1e:4000) ld [de],a ; store Y inc hl inc de - ld a,[W_BASECOORDX] + ld a,[wBaseCoordX] add [hl] ; X offset ld b,a ld a,168 @@ -95,13 +95,13 @@ DrawFrameBlock: ; 78000 (1e:4000) inc de jp .nextTile .flipHorizontalTranslateDown - ld a,[W_BASECOORDY] + ld a,[wBaseCoordY] add [hl] add a,40 ; translate Y coordinate downwards ld [de],a ; store Y inc hl inc de - ld a,[W_BASECOORDX] + ld a,[wBaseCoordX] add [hl] ld b,a ld a,168 @@ -125,47 +125,47 @@ DrawFrameBlock: ; 78000 (1e:4000) ld [de],a inc de .nextTile - ld a,[W_FBTILECOUNTER] + ld a,[wFBTileCounter] ld c,a - ld a,[W_NUMFBTILES] + ld a,[wNumFBTiles] cp c jp nz,.loop ; go back up if there are more tiles to draw .afterDrawingTiles - ld a,[W_FBMODE] + ld a,[wFBMode] cp a,2 jr z,.advanceFrameBlockDestAddr; skip delay and don't clean OAM buffer - ld a,[W_SUBANIMFRAMEDELAY] + ld a,[wSubAnimFrameDelay] ld c,a call DelayFrames - ld a,[W_FBMODE] + ld a,[wFBMode] cp a,3 jr z,.advanceFrameBlockDestAddr ; skip cleaning OAM buffer cp a,4 jr z,.done ; skip cleaning OAM buffer and don't advance the frame block destination address - ld a,[W_ANIMATIONID] + ld a,[wAnimationID] cp a,GROWL jr z,.resetFrameBlockDestAddr call AnimationCleanOAM .resetFrameBlockDestAddr ld hl,wOAMBuffer ; OAM buffer ld a,l - ld [W_FBDESTADDR + 1],a + ld [wFBDestAddr + 1],a ld a,h - ld [W_FBDESTADDR],a ; set destination address to beginning of OAM buffer + ld [wFBDestAddr],a ; set destination address to beginning of OAM buffer ret .advanceFrameBlockDestAddr ld a,e - ld [W_FBDESTADDR + 1],a + ld [wFBDestAddr + 1],a ld a,d - ld [W_FBDESTADDR],a + ld [wFBDestAddr],a .done ret PlayAnimation: ; 780f1 (1e:40f1) xor a ld [$FF8B],a ; it looks like nothing reads this - ld [W_SUBANIMTRANSFORM],a - ld a,[W_ANIMATIONID] ; get animation number + ld [wSubAnimTransform],a + ld a,[wAnimationID] ; get animation number dec a ld l,a ld h,0 @@ -217,7 +217,7 @@ PlayAnimation: ; 780f1 (1e:40f1) .playSubanimation ld c,a and a,%00111111 - ld [W_SUBANIMFRAMEDELAY],a + ld [wSubAnimFrameDelay],a xor a sla c rla @@ -235,9 +235,9 @@ PlayAnimation: ; 780f1 (1e:40f1) ld de,SubanimationPointers add hl,de ld a,l - ld [W_SUBANIMADDRPTR],a + ld [wSubAnimAddrPtr],a ld a,h - ld [W_SUBANIMADDRPTR + 1],a + ld [wSubAnimAddrPtr + 1],a ld l,c ld h,b push hl @@ -257,9 +257,9 @@ PlayAnimation: ; 780f1 (1e:40f1) ret LoadSubanimation: ; 7817c (1e:417c) - ld a,[W_SUBANIMADDRPTR + 1] + ld a,[wSubAnimAddrPtr + 1] ld h,a - ld a,[W_SUBANIMADDRPTR] + ld a,[wSubAnimAddrPtr] ld l,a ld a,[hli] ld e,a @@ -268,7 +268,7 @@ LoadSubanimation: ; 7817c (1e:417c) ld a,[de] ld b,a and a,31 - ld [W_SUBANIMCOUNTER],a ; number of frame blocks + ld [wSubAnimCounter],a ; number of frame blocks ld a,b and a,%11100000 cp a,5 << 5 ; is subanimation type 5? @@ -282,12 +282,12 @@ LoadSubanimation: ; 7817c (1e:417c) ; place the upper 3 bits of a into bits 0-2 of a before storing srl a swap a - ld [W_SUBANIMTRANSFORM],a + ld [wSubAnimTransform],a cp a,4 ; is the animation reversed? ld hl,0 jr nz,.storeSubentryAddr ; if the animation is reversed, then place the initial subentry address at the end of the list of subentries - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] dec a ld bc,3 .loop @@ -298,9 +298,9 @@ LoadSubanimation: ; 7817c (1e:417c) inc de add hl,de ld a,l - ld [W_SUBANIMSUBENTRYADDR],a + ld [wSubAnimSubEntryAddr],a ld a,h - ld [W_SUBANIMSUBENTRYADDR + 1],a + ld [wSubAnimSubEntryAddr + 1],a ret ; called if the subanimation type is not 5 @@ -384,7 +384,7 @@ MoveAnimation: ; 78d5e (1e:4d5e) push af call WaitForSoundToFinish call SetAnimationPalette - ld a,[W_ANIMATIONID] + ld a,[wAnimationID] and a jr z,.AnimationFinished @@ -397,7 +397,7 @@ MoveAnimation: ; 78d5e (1e:4d5e) .MoveAnimation ; check if battle animations are disabled in the options - ld a,[W_OPTIONS] + ld a,[wOptions] bit 7,a jr nz,.AnimationsDisabled call ShareMoveAnimations @@ -411,9 +411,9 @@ MoveAnimation: ; 78d5e (1e:4d5e) .AnimationFinished call WaitForSoundToFinish xor a - ld [W_SUBANIMSUBENTRYADDR],a + ld [wSubAnimSubEntryAddr],a ld [wUnusedD09B],a - ld [W_SUBANIMTRANSFORM],a + ld [wSubAnimTransform],a dec a ld [wAnimSoundID],a pop af @@ -430,7 +430,7 @@ ShareMoveAnimations: ; 78da6 (1e:4da6) ; opponent’s turn - ld a,[W_ANIMATIONID] + ld a,[wAnimationID] cp a,AMNESIA ld b,CONF_ANIM @@ -442,7 +442,7 @@ ShareMoveAnimations: ; 78da6 (1e:4da6) .Replace ld a,b - ld [W_ANIMATIONID],a + ld [wAnimationID],a ret PlayApplyingAttackAnimation: ; 78dbd (1e:4dbd) @@ -529,7 +529,7 @@ SetAnimationPalette: ; 78e23 (1e:4e23) ld a, $f0 ld [wAnimPalette], a ld b, $e4 - ld a, [W_ANIMATIONID] + ld a, [wAnimationID] cp TRADE_BALL_DROP_ANIM jr c, .next cp TRADE_BALL_POOF_ANIM + 1 @@ -558,12 +558,12 @@ PlaySubanimation: ; 78e53 (1e:4e53) .skipPlayingSound ld hl,wOAMBuffer ; base address of OAM buffer ld a,l - ld [W_FBDESTADDR + 1],a + ld [wFBDestAddr + 1],a ld a,h - ld [W_FBDESTADDR],a - ld a,[W_SUBANIMSUBENTRYADDR + 1] + ld [wFBDestAddr],a + ld a,[wSubAnimSubEntryAddr + 1] ld h,a - ld a,[W_SUBANIMSUBENTRYADDR] + ld a,[wSubAnimSubEntryAddr] ld l,a .loop push hl @@ -585,24 +585,24 @@ PlaySubanimation: ; 78e53 (1e:4e53) add hl,de add hl,de ld a,[hli] - ld [W_BASECOORDY],a + ld [wBaseCoordY],a ld a,[hl] - ld [W_BASECOORDX],a + ld [wBaseCoordX],a pop hl inc hl ld a,[hl] ; frame block mode - ld [W_FBMODE],a + ld [wFBMode],a call DrawFrameBlock call DoSpecialEffectByAnimationId ; run animation-specific function (if there is one) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] dec a - ld [W_SUBANIMCOUNTER],a + ld [wSubAnimCounter],a ret z - ld a,[W_SUBANIMSUBENTRYADDR + 1] + ld a,[wSubAnimSubEntryAddr + 1] ld h,a - ld a,[W_SUBANIMSUBENTRYADDR] + ld a,[wSubAnimSubEntryAddr] ld l,a - ld a,[W_SUBANIMTRANSFORM] + ld a,[wSubAnimTransform] cp a,4 ; is the animation reversed? ld bc,3 jr nz,.nextSubanimationSubentry @@ -610,9 +610,9 @@ PlaySubanimation: ; 78e53 (1e:4e53) .nextSubanimationSubentry add hl,bc ld a,h - ld [W_SUBANIMSUBENTRYADDR + 1],a + ld [wSubAnimSubEntryAddr + 1],a ld a,l - ld [W_SUBANIMSUBENTRYADDR],a + ld [wSubAnimSubEntryAddr],a jp .loop AnimationCleanOAM: ; 78ec8 (1e:4ec8) @@ -634,7 +634,7 @@ DoSpecialEffectByAnimationId: ; 78ed7 (1e:4ed7) push hl push de push bc - ld a,[W_ANIMATIONID] + ld a,[wAnimationID] ld hl,AnimationIdSpecialEffects ld de,3 call IsInArray @@ -737,21 +737,21 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) xor a,%00111100 ; complement colors 1 and 2 ld [rOBP0],a .skipFlashingEffect - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,11 ; is it the beginning of the subanimation? jr nz,.skipPlayingSound ; if it is the beginning of the subanimation, play a sound ld a,SFX_BALL_TOSS call PlaySound .skipPlayingSound - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] cp a,02 ; is it a trainer battle? jr z,.isTrainerBattle ld a,[wd11e] cp a,$10 ; is the enemy pokemon the Ghost Marowak? ret nz ; if the enemy pokemon is the Ghost Marowak, make it dodge during the last 3 frames - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,3 jr z,.moveGhostMarowakLeft cp a,2 @@ -775,15 +775,15 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) ld [rNR10],a ; Channel 1 sweep register ret .isTrainerBattle ; if it's a trainer battle, shorten the animation by one frame - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,3 ret nz dec a - ld [W_SUBANIMCOUNTER],a + ld [wSubAnimCounter],a ret DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,4 ; is it the beginning of a shake? jr nz,.skipPlayingSound ; if it is the beginning of a shake, play a sound and wait 2/3 of a second @@ -792,7 +792,7 @@ DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) ld c,40 call DelayFrames .skipPlayingSound - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] dec a ret nz ; if it's the end of the ball shaking subanimation, check if more shakes are left and restart the subanimation @@ -801,30 +801,30 @@ DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) ld [wNumShakes],a ret z ; if there are shakes left, restart the subanimation - ld a,[W_SUBANIMSUBENTRYADDR] + ld a,[wSubAnimSubEntryAddr] ld l,a - ld a,[W_SUBANIMSUBENTRYADDR + 1] + ld a,[wSubAnimSubEntryAddr + 1] ld h,a ld de,-(4 * 3) ; 4 subentries and 3 bytes per subentry add hl,de ld a,l - ld [W_SUBANIMSUBENTRYADDR],a + ld [wSubAnimSubEntryAddr],a ld a,h - ld [W_SUBANIMSUBENTRYADDR + 1],a + ld [wSubAnimSubEntryAddr + 1],a ld a,5 ; number of subentries in the ball shaking subanimation plus one - ld [W_SUBANIMCOUNTER],a + ld [wSubAnimCounter],a ret ; plays a sound after the second frame of the poof animation DoPoofSpecialEffects: ; 78fce (1e:4fce) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,5 ret nz ld a,SFX_BALL_POOF jp PlaySound DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,12 ret nc cp a,8 @@ -840,21 +840,21 @@ DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9) predef_jump PredefShakeScreenVertically ; shake vertically FlashScreenEveryEightFrameBlocks: ; 78ff7 (1e:4ff7) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] and a,7 ; is the subanimation counter exactly 8? call z,AnimationFlashScreen ; if so, flash the screen ret ; flashes the screen if the subanimation counter is divisible by 4 FlashScreenEveryFourFrameBlocks: ; 79000 (1e:5000) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] and a,3 call z,AnimationFlashScreen ret ; used for Explosion and Selfdestruct DoExplodeSpecialEffects: ; 79009 (1e:5009) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,1 ; is it the end of the subanimation? jr nz,FlashScreenEveryFourFrameBlocks ; if it's the end of the subanimation, make the attacking pokemon disappear @@ -863,7 +863,7 @@ DoExplodeSpecialEffects: ; 79009 (1e:5009) ; flashes the screen when subanimation counter is 1 modulo 4 DoBlizzardSpecialEffects: ; 79016 (1e:5016) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,13 jp z,AnimationFlashScreen cp a,9 @@ -877,7 +877,7 @@ DoBlizzardSpecialEffects: ; 79016 (1e:5016) ; flashes the screen at 3 points in the subanimation ; unused FlashScreenUnused: ; 7902e (1e:502e) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,14 jp z,AnimationFlashScreen cp a,9 @@ -888,7 +888,7 @@ FlashScreenUnused: ; 7902e (1e:502e) ; function to make the pokemon disappear at the beginning of the animation TradeHidePokemon: ; 79041 (1e:5041) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,6 ret nz ld a,2 * SCREEN_WIDTH + 7 @@ -896,7 +896,7 @@ TradeHidePokemon: ; 79041 (1e:5041) ; function to make a shaking pokeball jump up at the end of the animation TradeShakePokeball: ; 7904c (1e:504c) - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] cp a,1 ret nz ; if it's the end of the animation, make the ball jump up @@ -976,7 +976,7 @@ DoGrowlSpecialEffects: ; 790bc (1e:50bc) ld de,wOAMBuffer + $10 ld bc,$10 call CopyData ; copy the musical note graphic - ld a,[W_SUBANIMCOUNTER] + ld a,[wSubAnimCounter] dec a call z,AnimationCleanOAM ; clean up at the end of the subanimation ret @@ -984,7 +984,7 @@ DoGrowlSpecialEffects: ; 790bc (1e:50bc) ; this is associated with Tail Whip, but Tail Whip doesn't use any subanimations TailWhipAnimationUnused: ; 790d0 (1e:50d0) ld a,1 - ld [W_SUBANIMCOUNTER],a + ld [wSubAnimCounter],a ld c,20 jp DelayFrames @@ -1243,17 +1243,17 @@ AnimationWaterDropletsEverywhere: ; 79215 (1e:5215) call LoadAnimationTileset ld d, 32 ld a, -16 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld a, $71 ld [wDropletTile], a .loop ld a, 16 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld a, 0 ld [wUnusedD08A], a call _AnimationWaterDroplets ld a, 24 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld a, 32 ld [wUnusedD08A], a call _AnimationWaterDroplets @@ -1264,24 +1264,24 @@ AnimationWaterDropletsEverywhere: ; 79215 (1e:5215) _AnimationWaterDroplets: ; 79246 (1e:5246) ld hl, wOAMBuffer .loop - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] ld [hli], a ; Y - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] add 27 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld [hli], a ; X ld a, [wDropletTile] ld [hli], a ; tile xor a ld [hli], a ; attribute - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] cp 144 jr c, .loop sub 168 - ld [W_BASECOORDX], a - ld a, [W_BASECOORDY] + ld [wBaseCoordX], a + ld a, [wBaseCoordY] add 16 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a cp 112 jr c, .loop call AnimationCleanOAM @@ -1387,14 +1387,14 @@ ShakeEnemyHUD_WritePlayerMonPicOAM: ; 792fd (1e:52fd) ; Writes the OAM entries for a copy of the player mon's pic in OAM. ; The top 5 rows are reproduced in OAM, although only 2 are actually needed. ld a, $10 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld a, $30 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld hl, wOAMBuffer ld d, 0 ld c, 7 .loop - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] ld e, a ld b, 5 .innerLoop @@ -1406,21 +1406,21 @@ ShakeEnemyHUD_WritePlayerMonPicOAM: ; 792fd (1e:52fd) ret z inc d inc d - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] add 8 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a jr .loop BattleAnimWriteOAMEntry: ; 79329 (1e:5329) ; Y coordinate = e (increased by 8 each call, before the write to OAM) -; X coordinate = [W_BASECOORDX] +; X coordinate = [wBaseCoordX] ; tile = d ; attributes = 0 ld a, e add 8 ld e, a ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] ld [hli], a ld a, d ld [hli], a @@ -1749,9 +1749,9 @@ AnimationShootBallsUpward: ; 794f9 (1e:54f9) lb bc, 6 * 8, 5 * 8 .next ld a, b - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld a, c - ld [W_BASECOORDX], a + ld [wBaseCoordX], a lb bc, 5, 1 call _AnimationShootBallsUpward jp AnimationCleanOAM @@ -1765,7 +1765,7 @@ _AnimationShootBallsUpward: ; 79517 (1e:5517) ld d, $7a ; ball tile ld hl, wOAMBuffer push bc - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] ld e, a .initOAMLoop call BattleAnimWriteOAMEntry @@ -1779,7 +1779,7 @@ _AnimationShootBallsUpward: ; 79517 (1e:5517) push bc ld hl, wOAMBuffer .innerLoop - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] add 8 ld e, a ld a, [hl] @@ -1819,11 +1819,11 @@ AnimationShootManyBallsUpward: ; 79566 (1e:5566) ld [wSavedY], a .loop ld a, [wSavedY] - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld a, [hli] cp $ff jp z, AnimationCleanOAM - ld [W_BASECOORDX], a + ld [wBaseCoordX], a lb bc, 4, 1 push hl call _AnimationShootBallsUpward @@ -2096,10 +2096,10 @@ HideSubstituteShowMonAnim: ; 79747 (1e:5747) ld a, [H_WHOSETURN] and a ld hl, wPlayerMonMinimized - ld a, [W_PLAYERBATTSTATUS2] + ld a, [wPlayerBattleStatus2] jr z, .next1 ld hl, wEnemyMonMinimized - ld a, [W_ENEMYBATTSTATUS2] + ld a, [wEnemyBattleStatus2] .next1 push hl ; if the substitute broke, slide it down, else slide it offscreen horizontally @@ -2150,7 +2150,7 @@ ChangeMonPic: ; 79793 (1e:5793) ld [wcf91], a ld [wd0b5], a xor a - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a call GetMonHeader coord hl, 12, 0 call LoadFrontSpriteByMonIndex @@ -2196,7 +2196,7 @@ InitMultipleObjectsOAM: ; 797e8 (1e:57e8) pop bc xor a ld e, a - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld hl, wOAMBuffer .loop call BattleAnimWriteOAMEntry @@ -2354,7 +2354,7 @@ GetMoveSound: ; 7986f (1e:586f) IsCryMove: ; 798ad (1e:58ad) ; set carry if the move animation involves playing a monster cry - ld a,[W_ANIMATIONID] + ld a,[wAnimationID] cp a,GROWL jr z,.CryMove cp a,ROAR @@ -2953,7 +2953,7 @@ BattleAnimCopyTileMapToVRAM: ; 79e0d (1e:5e0d) jp Delay3 TossBallAnimation: ; 79e16 (1e:5e16) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] cp a,2 jr z,.BlockBall ; if in trainer battle, play different animation ld a,[wPokeBallAnimData] @@ -2984,7 +2984,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) .done ld a,b .PlayNextAnimation - ld [W_ANIMATIONID],a + ld [wAnimationID],a push bc push hl call PlayAnimation @@ -3001,12 +3001,12 @@ TossBallAnimation: ; 79e16 (1e:5e16) .BlockBall ; 5E55 ld a,TOSS_ANIM - ld [W_ANIMATIONID],a + ld [wAnimationID],a call PlayAnimation ld a,SFX_FAINT_THUD call PlaySound ld a,BLOCKBALL_ANIM - ld [W_ANIMATIONID],a + ld [wAnimationID],a jp PlayAnimation PlayApplyingAttackSound: ; 79e6a (1e:5e6a) diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 9a5f62b1..545273ee 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -81,7 +81,7 @@ BattleTransitions: ; 709d2 (1c:49d2) dw BattleTransition_Split ; %111 GetBattleTransitionID_WildOrTrainer: ; 709e2 (1c:49e2) - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] cp 200 jr nc, .trainer res 0, c @@ -105,7 +105,7 @@ GetBattleTransitionID_CompareLevels: ; 709ef (1c:49ef) ld a, [hl] add $3 ld e, a - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] sub e jr nc, .highLevelEnemy res 1, c @@ -122,7 +122,7 @@ GetBattleTransitionID_CompareLevels: ; 709ef (1c:49ef) ; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE ; and SILPH_CO_[9-11]F as dungeon maps GetBattleTransitionID_IsDungeonMap: ; 70a19 (1c:4a19) - ld a, [W_CURMAP] + ld a, [wCurMap] ld e, a ld hl, DungeonMaps1 .loop1 @@ -151,7 +151,7 @@ GetBattleTransitionID_IsDungeonMap: ; 70a19 (1c:4a19) res 2, c ret -; GetBattleTransitionID_IsDungeonMap checks if W_CURMAP +; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is equal to one of these maps DungeonMaps1: ; 70a3f (1c:4a3f) db VIRIDIAN_FOREST @@ -160,7 +160,7 @@ DungeonMaps1: ; 70a3f (1c:4a3f) db ROCK_TUNNEL_2 db $FF -; GetBattleTransitionID_IsDungeonMap checks if W_CURMAP +; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is in between or equal to each pair of maps DungeonMaps2: ; 70a44 (1c:4a44) ; all MT_MOON maps diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index a1afcb75..476284f0 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -1,8 +1,8 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a jr nz, .trainerBattle - ld a, [W_CURMAP] + ld a, [wCurMap] cp POKEMONTOWER_3 jr c, .notPokemonTower cp LAVENDER_HOUSE_1 @@ -11,7 +11,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) ld a, [wEnemyMonSpecies2] call PlayCry ld hl, WildMonAppearedText - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr z, .notFishing ld hl, HookedMonAttackedText diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a00d15bb..56ea5a20 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -239,7 +239,7 @@ StartBattle: ; 3c11e (f:411e) .foundFirstAliveEnemyMon ld a, d ld [wSerialExchangeNybbleReceiveData], a - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a ; is it a trainer battle? call nz, EnemySendOutFirstMon ; if it is a trainer battle, send out enemy mon ld c, 40 @@ -251,7 +251,7 @@ StartBattle: ; 3c11e (f:411e) and a jp z, HandlePlayerBlackOut ; jump if no mon is alive call LoadScreenTilesFromBuffer1 - ld a, [W_BATTLETYPE] + ld a, [wBattleType] and a ; is it a normal battle? jp z, .playerSendOutFirstMon ; if so, send out player mon ; safari zone battle @@ -261,7 +261,7 @@ StartBattle: ; 3c11e (f:411e) ld a, [wActionResultOrTookBattleTurn] and a ; was the item used successfully? jr z, .displaySafariZoneBattleMenu ; if not, display the menu again; XXX does this ever jump? - ld a, [W_NUMSAFARIBALLS] + ld a, [wNumSafariBalls] and a jr nz, .notOutOfSafariBalls call LoadScreenTilesFromBuffer1 @@ -380,13 +380,13 @@ MainInBattleLoop: ; 3c233 (f:4233) call SaveScreenTilesToBuffer1 xor a ld [wFirstMonsNotOutYet], a - ld a, [W_PLAYERBATTSTATUS2] + ld a, [wPlayerBattleStatus2] and (1 << NeedsToRecharge) | (1 << UsingRage) ; check if the player is using Rage or needs to recharge jr nz, .selectEnemyMove ; the player is not using Rage and doesn't need to recharge - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 res Flinched, [hl] ; reset flinch bit - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 res Flinched, [hl] ; reset flinch bit ld a, [hl] and (1 << ThrashingAbout) | (1 << ChargingUp) ; check if the player is thrashing about or charging for an attack @@ -400,10 +400,10 @@ MainInBattleLoop: ; 3c233 (f:4233) ld a, [wBattleMonStatus] and (1 << FRZ) | SLP ; is mon frozen or asleep? jr nz, .selectEnemyMove ; if so, jump - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] and (1 << StoringEnergy) | (1 << UsingTrappingMove) ; check player is using Bide or using a multi-turn attack like wrap jr nz, .selectEnemyMove ; if so, jump - ld a, [W_ENEMYBATTSTATUS1] + ld a, [wEnemyBattleStatus1] bit UsingTrappingMove, a ; check if enemy is using a multi-turn attack like wrap jr z, .selectPlayerMove ; if not, jump ; enemy is using a mult-turn attack like wrap, so player is trapped and cannot execute a move @@ -416,7 +416,7 @@ MainInBattleLoop: ; 3c233 (f:4233) jr nz, .selectEnemyMove ld [wMoveMenuType], a inc a - ld [W_ANIMATIONID], a + ld [wAnimationID], a xor a ld [wMenuItemToSwap], a call MoveSelectionMenu @@ -441,7 +441,7 @@ MainInBattleLoop: ; 3c233 (f:4233) sub $4 jr c, .noLinkBattle ; the link battle enemy has switched mons - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] bit UsingTrappingMove, a ; check if using multi-turn move like Wrap jr z, .asm_3c2dd ld a, [wPlayerMoveListIndex] @@ -584,11 +584,11 @@ HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd) pop hl call HandlePoisonBurnLeechSeed_DecreaseOwnHP .notBurnedOrPoisoned - ld de, W_PLAYERBATTSTATUS2 + ld de, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .playersTurn2 - ld de, W_ENEMYBATTSTATUS2 + ld de, wEnemyBattleStatus2 .playersTurn2 ld a, [de] add a @@ -659,13 +659,13 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ; 3c43d (f:443d) jr nz, .nonZeroDamage inc c ; damage is at least 1 .nonZeroDamage - ld hl, W_PLAYERBATTSTATUS3 - ld de, W_PLAYERTOXICCOUNTER + ld hl, wPlayerBattleStatus3 + ld de, wPlayerToxicCounter ld a, [H_WHOSETURN] and a jr z, .playersTurn - ld hl, W_ENEMYBATTSTATUS3 - ld de, W_ENEMYTOXICCOUNTER + ld hl, wEnemyBattleStatus3 + ld de, wEnemyToxcCounter .playersTurn bit BadlyPoisoned, [hl] jr z, .noToxic @@ -775,14 +775,14 @@ CheckNumAttacksLeft: ; 3c50f (f:450f) and a jr nz, .checkEnemy ; player has 0 attacks left - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 res UsingTrappingMove, [hl] ; player not using multi-turn attack like wrap any more .checkEnemy ld a, [wEnemyNumAttacksLeft] and a ret nz ; enemy has 0 attacks left - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 res UsingTrappingMove, [hl] ; enemy not using multi-turn attack like wrap any more ret @@ -798,7 +798,7 @@ HandleEnemyMonFainted: ; 3c525 (f:4525) ld a, [hli] or [hl] ; is battle mon HP zero? call nz, DrawPlayerHUDAndHPBar ; if battle mon HP is not zero, draw player HD and HP bar - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a ret z ; return if it's a wild battle call AnyEnemyPokemonAliveCheck @@ -821,7 +821,7 @@ HandleEnemyMonFainted: ; 3c525 (f:4525) FaintEnemyPokemon: ; 0x3c567 call ReadPlayerMonCurHPAndStatus - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a jr z, .wild ld a, [wEnemyMonPartyPos] @@ -832,7 +832,7 @@ FaintEnemyPokemon: ; 0x3c567 ld [hli], a ld [hl], a .wild - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 res AttackingMultipleTimes, [hl] ; Bug. This only zeroes the high byte of the player's accumulated damage, ; setting the accumulated damage to itself mod 256 instead of 0 as was probably @@ -851,7 +851,7 @@ FaintEnemyPokemon: ; 0x3c567 ld [hli], a ld [hli], a ld [hl], a - ld [W_ENEMYDISABLEDMOVE], a + ld [wEnemyDisabledMove], a ld [wEnemyDisabledMoveNumber], a ld [wEnemyMonMinimized], a ld hl, wPlayerUsedMove @@ -863,7 +863,7 @@ FaintEnemyPokemon: ; 0x3c567 coord hl, 0, 0 lb bc, 4, 11 call ClearScreenArea - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a jr z, .wild_win xor a @@ -994,7 +994,7 @@ ReplaceFaintedEnemyMon: ; 3c664 (f:4664) .notLinkBattle call EnemySendOut xor a - ld [W_ENEMYMOVENUM], a + ld [wEnemyMoveNum], a ld [wActionResultOrTookBattleTurn], a ld [wAILayer2Encouragement], a inc a ; reset Z flag @@ -1003,16 +1003,16 @@ ReplaceFaintedEnemyMon: ; 3c664 (f:4664) TrainerBattleVictory: ; 3c696 (f:4696) call EndLowHealthAlarm ld b, MUSIC_DEFEATED_GYM_LEADER - ld a, [W_GYMLEADERNO] + ld a, [wGymLeaderNo] and a jr nz, .gymleader ld b, MUSIC_DEFEATED_TRAINER .gymleader - ld a, [W_TRAINERCLASS] + ld a, [wTrainerClass] cp SONY3 ; final battle against rival jr nz, .notrival ld b, MUSIC_DEFEATED_GYM_LEADER - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 1, [hl] .notrival ld a, [wLinkState] @@ -1068,7 +1068,7 @@ HandlePlayerMonFainted: ; 3c700 (f:4700) jr nz, .doUseNextMonDialogue ; if not, jump ; the enemy mon has 0 HP call FaintEnemyPokemon - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a ret z ; if wild encounter, battle is over call AnyEnemyPokemonAliveCheck @@ -1094,7 +1094,7 @@ RemoveFaintedPlayerMon: ; 3c741 (f:4741) ld hl, wPartyGainExpFlags ld b, FLAG_RESET predef FlagActionPredef ; clear gain exp flag for fainted mon - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 res 2, [hl] ; reset "attacking multiple times" flag ld a, [wLowHealthAlarm] bit 7, a ; skip sound flag (red bar (?)) @@ -1140,7 +1140,7 @@ PlayerMonFaintedText: ; 3c796 (f:4796) DoUseNextMonDialogue: ; 3c79b (f:479b) call PrintEmptyString call SaveScreenTilesToBuffer1 - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a dec a ret nz ; return if it's a trainer battle @@ -1221,7 +1221,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) ld a, [wLinkState] cp LINK_STATE_BATTLING jr z, .notSony1Battle - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] cp OPP_SONY1 jr nz, .notSony1Battle coord hl, 0, 0 ; sony 1 battle @@ -1232,7 +1232,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) call DelayFrames ld hl, Sony1WinText call PrintText - ld a, [W_CURMAP] + ld a, [wCurMap] cp OAKS_LAB ret z ; starter battle in oak's lab: don't black out .notSony1Battle @@ -1384,7 +1384,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) ld [hli],a ld [hli],a ld [hl],a - ld [W_ENEMYDISABLEDMOVE],a + ld [wEnemyDisabledMove],a ld [wEnemyDisabledMoveNumber],a ld [wEnemyMonMinimized],a ld hl,wPlayerUsedMove @@ -1392,7 +1392,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) ld [hl],a dec a ld [wAICount],a - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 res 5,[hl] coord hl, 18, 0 ld a,8 @@ -1432,7 +1432,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) ld bc,wEnemyMon2 - wEnemyMon1 call AddNTimes ld a,[hl] - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a ld a,[wWhichPokemon] inc a ld hl,wEnemyPartyCount @@ -1459,7 +1459,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) ld a,[wLinkState] cp LINK_STATE_BATTLING jr z,.next4 - ld a,[W_OPTIONS] + ld a,[wOptions] bit 6,a jr nz,.next4 ld hl, TrainerAboutToUseText @@ -1583,13 +1583,13 @@ NoWillText: ; 3cab4 (f:4ab4) TryRunningFromBattle: ; 3cab9 (f:4ab9) call IsGhostBattle jp z, .canEscape ; jump if it's a ghost battle - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI jp z, .canEscape ; jump if it's a safari battle ld a, [wLinkState] cp LINK_STATE_BATTLING jp z, .canEscape - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a jr nz, .trainerBattle ; jump if it's a trainer battle ld a, [wNumRunAttempts] @@ -1787,7 +1787,7 @@ LoadEnemyMonFromParty: ; 3cc13 (f:4c13) ld bc, 1 + NUM_STATS * 2 call CopyData call ApplyBurnAndParalysisPenaltiesToEnemy - ld hl, W_MONHBASESTATS + ld hl, wMonHBaseStats ld de, wEnemyMonBaseStats ld b, NUM_STATS .copyBaseStatsLoop @@ -1824,7 +1824,7 @@ SendOutMon: ; 3cc91 (f:4c91) ld [hl], a ld [wBoostExpByExpAll], a ld [wDamageMultipliers], a - ld [W_PLAYERMOVENUM], a + ld [wPlayerMoveNum], a ld hl, wPlayerUsedMove ld [hli], a ld [hl], a @@ -1834,12 +1834,12 @@ SendOutMon: ; 3cc91 (f:4c91) ld [hli], a ld [hli], a ld [hl], a - ld [W_PLAYERDISABLEDMOVE], a + ld [wPlayerDisabledMove], a ld [wPlayerDisabledMoveNumber], a ld [wPlayerMonMinimized], a ld b, SET_PAL_BATTLE call RunPaletteCommand - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 res UsingTrappingMove, [hl] ld a, $1 ld [H_WHOSETURN], a @@ -2086,14 +2086,14 @@ CenterMonName: ; 3ce9c (f:4e9c) DisplayBattleMenu: ; 3ceb3 (f:4eb3) call LoadScreenTilesFromBuffer1 ; restore saved screen - ld a, [W_BATTLETYPE] + ld a, [wBattleType] and a jr nz, .nonstandardbattle call DrawHUDsAndHPBars call PrintEmptyString call SaveScreenTilesToBuffer1 .nonstandardbattle - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI ld a, BATTLE_MENU_TEMPLATE jr nz, .menuselected @@ -2101,12 +2101,12 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) .menuselected ld [wTextBoxID], a call DisplayTextBoxID - ld a, [W_BATTLETYPE] + ld a, [wBattleType] dec a jp nz, .handleBattleMenuInput ; handle menu input if it's not the old man tutorial ; the following happens for the old man tutorial ld hl, wPlayerName - ld de, W_GRASSRATE + ld de, wGrassRate ld bc, NAME_LENGTH call CopyData ; temporarily save the player name in unused space, ; which is supposed to get overwritten when entering a @@ -2143,7 +2143,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) ld [wLastMenuItem], a jr .rightColumn .leftColumn ; put cursor in left column of menu - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI ld a, " " jr z, .safariLeftColumn @@ -2156,7 +2156,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) Coorda 13, 14 Coorda 13, 16 coord hl, 7, 14 - ld de, W_NUMSAFARIBALLS + ld de, wNumSafariBalls lb bc, 1, 2 call PrintNumber ld b, $1 ; top menu item X @@ -2176,7 +2176,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) jr nz, .rightColumn jr .AButtonPressed ; the A button was pressed .rightColumn ; put cursor in right column of menu - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI ld a, " " jr z, .safariRightColumn @@ -2189,7 +2189,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) Coorda 1, 14 ; clear upper cursor position in left column Coorda 1, 16 ; clear lower cursor position in left column coord hl, 7, 14 - ld de, W_NUMSAFARIBALLS + ld de, wNumSafariBalls lb bc, 1, 2 call PrintNumber ld b, $d ; top menu item X @@ -2213,7 +2213,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) ld [wCurrentMenuItem], a .AButtonPressed call PlaceUnfilledArrowMenuCursor - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI ld a, [wCurrentMenuItem] ld [wBattleAndStartSavedMenuItem], a @@ -2235,7 +2235,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) and a jr nz, .upperLeftMenuItemWasNotSelected ; the upper left menu item was selected - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI jr z, .throwSafariBallWasSelected ; the "FIGHT" menu was selected @@ -2263,7 +2263,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) .notLinkBattle call SaveScreenTilesToBuffer2 - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI jr nz, BagWasSelected @@ -2274,14 +2274,14 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) BagWasSelected: call LoadScreenTilesFromBuffer1 - ld a, [W_BATTLETYPE] + ld a, [wBattleType] and a ; is it a normal battle? jr nz, .next ; normal battle call DrawHUDsAndHPBars .next - ld a, [W_BATTLETYPE] + ld a, [wBattleType] dec a ; is it the old man tutorial? jr nz, DisplayPlayerBag ; no, it is a normal battle ld hl, OldManItemList @@ -2332,7 +2332,7 @@ UseBagItem: call ClearSprites xor a ld [wCurrentMenuItem], a - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI jr z, .checkIfMonCaptured @@ -2340,13 +2340,13 @@ UseBagItem: and a ; was the item used successfully? jp z, BagWasSelected ; if not, go back to the bag menu - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] bit UsingTrappingMove, a ; is the player using a multi-turn move like wrap? jr z, .checkIfMonCaptured ld hl, wPlayerNumAttacksLeft dec [hl] jr nz, .checkIfMonCaptured - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 res UsingTrappingMove, [hl] ; not using multi-turn move any more .checkIfMonCaptured @@ -2354,7 +2354,7 @@ UseBagItem: and a ; was the enemy mon captured with a ball? jr nz, .returnAfterCapturingMon - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI jr z, .returnAfterUsingItem_NoCapture ; not a safari battle @@ -2385,7 +2385,7 @@ PartyMenuOrRockOrRun: jp nz, BattleMenu_RunWasSelected ; party menu or rock was selected call SaveScreenTilesToBuffer2 - ld a, [W_BATTLETYPE] + ld a, [wBattleType] cp BATTLE_TYPE_SAFARI jr nz, .partyMenuWasSelected ; safari battle @@ -2453,7 +2453,7 @@ PartyMenuOrRockOrRun: predef StatusScreen predef StatusScreen2 ; now we need to reload the enemy mon pic - ld a, [W_ENEMYBATTSTATUS2] + ld a, [wEnemyBattleStatus2] bit HasSubstituteUp, a ; does the enemy mon have a substitute? ld hl, AnimationSubstitute jr nz, .doEnemyMonAnimation @@ -2641,7 +2641,7 @@ MoveSelectionMenu: ; 3d219 (f:5219) ld a, [wLinkState] cp LINK_STATE_BATTLING jr z, .matchedkeyspicked - ld a, [W_FLAGS_D733] + ld a, [wFlags_D733] bit BIT_TEST_BATTLE, a ld b, D_UP | D_DOWN | A_BUTTON | B_BUTTON | SELECT jr z, .matchedkeyspicked @@ -2669,7 +2669,7 @@ SelectMenuItem: ; 3d2fe (f:52fe) call PlaceString jr .select .battleselect - ld a, [W_FLAGS_D733] + ld a, [wFlags_D733] bit BIT_TEST_BATTLE, a jr nz, .select call PrintMenuItem @@ -2724,13 +2724,13 @@ SelectMenuItem: ; 3d2fe (f:52fe) ld a, [hl] and $3f jr z, .nopp - ld a, [W_PLAYERDISABLEDMOVE] + ld a, [wPlayerDisabledMove] swap a and $f dec a cp c jr z, .disabled - ld a, [W_PLAYERBATTSTATUS3] + ld a, [wPlayerBattleStatus3] bit 3, a ; transformed jr nz, .dummy ; game freak derp .dummy @@ -2791,7 +2791,7 @@ AnyMoveToSelect: ; 3d3f5 (f:53f5) ; return z and Struggle as the selected move if all moves have 0 PP and/or are disabled ld a, STRUGGLE ld [wPlayerSelectedMove], a - ld a, [W_PLAYERDISABLEDMOVE] + ld a, [wPlayerDisabledMove] and a ld hl, wBattleMonPP jr nz, .asm_3d40e @@ -2843,7 +2843,7 @@ SwapMovesInMenu: ; 3d435 (f:5435) ld hl, wBattleMonPP call .swapBytes ; swap move PP ; update the index of the disabled move if necessary - ld hl, W_PLAYERDISABLEDMOVE + ld hl, wPlayerDisabledMove ld a, [hl] swap a and $f @@ -2917,7 +2917,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6) ld b, $3 ld c, $9 call TextBoxBorder - ld a, [W_PLAYERDISABLEDMOVE] + ld a, [wPlayerDisabledMove] and a jr z, .notDisabled swap a @@ -3014,20 +3014,20 @@ SelectEnemyMove: ; 3d564 (f:5564) ld a, [hl] jr .done .noLinkBattle - ld a, [W_ENEMYBATTSTATUS2] + ld a, [wEnemyBattleStatus2] and (1 << NeedsToRecharge) | (1 << UsingRage) ; need to recharge or using rage ret nz - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 ld a, [hl] and (1 << ChargingUp) | (1 << ThrashingAbout) ; using a charging move or thrash/petal dance ret nz ld a, [wEnemyMonStatus] and SLP | 1 << FRZ ; sleeping or frozen ret nz - ld a, [W_ENEMYBATTSTATUS1] + ld a, [wEnemyBattleStatus1] and (1 << UsingTrappingMove) | (1 << StoringEnergy) ; using a trapping move like wrap or bide ret nz - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] bit UsingTrappingMove, a ; caught in player's trapping move (e.g. wrap) jr z, .canSelectMove .unableToSelectMove @@ -3038,12 +3038,12 @@ SelectEnemyMove: ; 3d564 (f:5564) ld a, [hld] and a jr nz, .atLeastTwoMovesAvailable - ld a, [W_ENEMYDISABLEDMOVE] + ld a, [wEnemyDisabledMove] and a ld a, STRUGGLE ; struggle if the only move is disabled jr nz, .done .atLeastTwoMovesAvailable - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a jr z, .chooseRandomMove ; wild encounter callab AIEnemyTrainerChooseMoves @@ -3067,7 +3067,7 @@ SelectEnemyMove: ; 3d564 (f:5564) ld a, b dec a ld [wEnemyMoveListIndex], a - ld a, [W_ENEMYDISABLEDMOVE] + ld a, [wEnemyDisabledMove] swap a and $f cp b @@ -3139,7 +3139,7 @@ ExecutePlayerMove: ; 3d65e (f:565e) inc a jp z, ExecutePlayerMoveDone ; for selected move = FF, skip most of player's turn xor a - ld [W_MOVEMISSED], a + ld [wMoveMissed], a ld [wMonIsDisobedient], a ld [wMoveDidntMiss], a ld a, $a @@ -3154,14 +3154,14 @@ ExecutePlayerMove: ; 3d65e (f:565e) jp [hl] .playerHasNoSpecialCondition call GetCurrentMove - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 bit ChargingUp, [hl] ; charging up for attack jr nz, PlayerCanExecuteChargingMove call CheckForDisobedience jp z, ExecutePlayerMoveDone CheckIfPlayerNeedsToChargeUp: ; 3d69a (f:569a) - ld a, [W_PLAYERMOVEEFFECT] + ld a, [wPlayerMoveEffect] cp CHARGE_EFFECT jp z, JumpMoveEffect cp FLY_EFFECT @@ -3170,7 +3170,7 @@ CheckIfPlayerNeedsToChargeUp: ; 3d69a (f:569a) ; in-battle stuff PlayerCanExecuteChargingMove: ; 3d6a9 (f:56a9) - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 res ChargingUp,[hl] ; reset charging up and invulnerability statuses if mon was charging up for an attack ; being fully paralyzed or hurting oneself in confusion removes charging up status ; resulting in the Pokemon being invulnerable for the whole battle @@ -3181,19 +3181,19 @@ PlayerCanExecuteMove: ; 3d6b0 (f:56b0) ld de,wPlayerSelectedMove ; pointer to the move just used ld b,BANK(DecrementPP) call Bankswitch - ld a,[W_PLAYERMOVEEFFECT] ; effect of the move just used + ld a,[wPlayerMoveEffect] ; effect of the move just used ld hl,ResidualEffects1 ld de,1 call IsInArray jp c,JumpMoveEffect ; ResidualEffects1 moves skip damage calculation and accuracy tests ; unless executed as part of their exclusive effect functions - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] ld hl,SpecialEffectsCont ld de,1 call IsInArray call c,JumpMoveEffect ; execute the effects of SpecialEffectsCont moves (e.g. Wrap, Thrash) but don't skip anything PlayerCalcMoveDamage: ; 3d6dc (f:56dc) - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] ld hl,SetDamageEffects ld de,1 call IsInArray @@ -3210,33 +3210,33 @@ PlayerCalcMoveDamage: ; 3d6dc (f:56dc) .moveHitTest call MoveHitTest handleIfPlayerMoveMissed - ld a,[W_MOVEMISSED] + ld a,[wMoveMissed] and a jr z,getPlayerAnimationType - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] sub a,EXPLODE_EFFECT jr z,playPlayerMoveAnimation ; don't play any animation if the move missed, unless it was EXPLODE_EFFECT jr playerCheckIfFlyOrChargeEffect getPlayerAnimationType - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] and a ld a,4 ; move has no effect other than dealing damage jr z,playPlayerMoveAnimation ld a,5 ; move has effect playPlayerMoveAnimation push af - ld a,[W_PLAYERBATTSTATUS2] + ld a,[wPlayerBattleStatus2] bit HasSubstituteUp,a ld hl,HideSubstituteShowMonAnim ld b,BANK(HideSubstituteShowMonAnim) call nz,Bankswitch pop af ld [wAnimationType],a - ld a,[W_PLAYERMOVENUM] + ld a,[wPlayerMoveNum] call PlayMoveAnimation call HandleExplodingAnimation call DrawPlayerHUDAndHPBar - ld a,[W_PLAYERBATTSTATUS2] + ld a,[wPlayerBattleStatus2] bit HasSubstituteUp,a ld hl,ReshowSubstituteAnim ld b,BANK(ReshowSubstituteAnim) @@ -3245,7 +3245,7 @@ playPlayerMoveAnimation playerCheckIfFlyOrChargeEffect ld c,30 call DelayFrames - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] cp a,FLY_EFFECT jr z,.playAnim cp a,CHARGE_EFFECT @@ -3257,7 +3257,7 @@ playerCheckIfFlyOrChargeEffect ld a,STATUS_AFFECTED_ANIM call PlayMoveAnimation MirrorMoveCheck - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] cp a,MIRROR_MOVE_EFFECT jr nz,.metronomeCheck call MirrorMoveCopyMove @@ -3271,16 +3271,16 @@ MirrorMoveCheck call MetronomePickMove jp CheckIfPlayerNeedsToChargeUp ; Go back to damage calculation for the move picked by Metronome .next - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] ld hl,ResidualEffects2 ld de,1 call IsInArray jp c,JumpMoveEffect ; done here after executing effects of ResidualEffects2 - ld a,[W_MOVEMISSED] + ld a,[wMoveMissed] and a jr z,.moveDidNotMiss call PrintMoveFailureText - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] cp a,EXPLODE_EFFECT ; even if Explosion or Selfdestruct missed, its effect still needs to be activated jr z,.notDone jp ExecutePlayerMoveDone ; otherwise, we're done if the move missed @@ -3291,7 +3291,7 @@ MirrorMoveCheck ld a,1 ld [wMoveDidntMiss],a .notDone - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] ld hl,AlwaysHappenSideEffects ld de,1 call IsInArray @@ -3303,7 +3303,7 @@ MirrorMoveCheck ret z ; don't do anything else if the enemy fainted call HandleBuildingRage - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 bit AttackingMultipleTimes,[hl] jr z,.executeOtherEffects ld a,[wPlayerNumAttacksLeft] @@ -3317,7 +3317,7 @@ MirrorMoveCheck xor a ld [wPlayerNumHits],a .executeOtherEffects - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] and a jp z,ExecutePlayerMoveDone ld hl,SpecialEffects @@ -3368,10 +3368,10 @@ GetOutText: ; 3d835 (f:5835) db "@" IsGhostBattle: ; 3d83a (f:583a) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] dec a ret nz - ld a,[W_CURMAP] + ld a,[wCurMap] cp a,POKEMONTOWER_1 jr c,.next cp a,LAVENDER_HOUSE_1 @@ -3424,7 +3424,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) jp .returnToHL .HeldInPlaceCheck - ld a,[W_ENEMYBATTSTATUS1] + ld a,[wEnemyBattleStatus1] bit UsingTrappingMove,a ; is enemy using a mult-turn move like wrap? jp z,.FlinchedCheck ld hl,CantMoveText @@ -3433,7 +3433,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) jp .returnToHL .FlinchedCheck - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 bit Flinched,[hl] jp z,.HyperBeamCheck res Flinched,[hl] ; reset player's flinch status @@ -3443,7 +3443,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) jp .returnToHL .HyperBeamCheck - ld hl,W_PLAYERBATTSTATUS2 + ld hl,wPlayerBattleStatus2 bit NeedsToRecharge,[hl] jr z,.AnyMoveDisabledCheck res NeedsToRecharge,[hl] ; reset player's recharge status @@ -3453,7 +3453,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) jp .returnToHL .AnyMoveDisabledCheck - ld hl,W_PLAYERDISABLEDMOVE + ld hl,wPlayerDisabledMove ld a,[hl] and a jr z,.ConfusedCheck @@ -3467,13 +3467,13 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) call PrintText .ConfusedCheck - ld a,[W_PLAYERBATTSTATUS1] + ld a,[wPlayerBattleStatus1] add a ; is player confused? jr nc,.TriedToUseDisabledMoveCheck - ld hl,W_PLAYERCONFUSEDCOUNTER + ld hl,wPlayerConfusedCounter dec [hl] jr nz,.IsConfused - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 res Confused,[hl] ; if confused counter hit 0, reset confusion status ld hl,ConfusedNoMoreText call PrintText @@ -3488,9 +3488,9 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) call BattleRandom cp a,$80 ; 50% chance to hurt itself jr c,.TriedToUseDisabledMoveCheck - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 ld a,[hl] - and a, 1 << Confused ; if mon hurts itself, clear every other status from W_PLAYERBATTSTATUS1 + and a, 1 << Confused ; if mon hurts itself, clear every other status from wPlayerBattleStatus1 ld [hl],a call HandleSelfConfusionDamage jr .MonHurtItselfOrFullyParalysed @@ -3518,12 +3518,12 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) call PrintText .MonHurtItselfOrFullyParalysed - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 ld a,[hl] ; clear bide, thrashing, charging up, and trapping moves such as warp (already cleared for confusion damage) and $ff ^ ((1 << StoringEnergy) | (1 << ThrashingAbout) | (1 << ChargingUp) | (1 << UsingTrappingMove)) ld [hl],a - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] cp a,FLY_EFFECT jr z,.FlyOrChargeEffect cp a,CHARGE_EFFECT @@ -3540,12 +3540,12 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) jp .returnToHL ; if using a two-turn move, we need to recharge the first turn .BideCheck - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 bit StoringEnergy,[hl] ; is mon using bide? jr z,.ThrashingAboutCheck xor a - ld [W_PLAYERMOVENUM],a - ld hl,W_DAMAGE + ld [wPlayerMoveNum],a + ld hl,wDamage ld a,[hli] ld b,a ld c,[hl] @@ -3562,30 +3562,30 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) ld hl,ExecutePlayerMoveDone jp .returnToHL ; unless mon unleashes energy, can't move this turn .UnleashEnergy - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 res StoringEnergy,[hl] ; not using bide any more ld hl,UnleashedEnergyText call PrintText ld a,1 - ld [W_PLAYERMOVEPOWER],a + ld [wPlayerMovePower],a ld hl,wPlayerBideAccumulatedDamage + 1 ld a,[hld] add a ld b,a - ld [W_DAMAGE + 1],a + ld [wDamage + 1],a ld a,[hl] rl a ; double the damage - ld [W_DAMAGE],a + ld [wDamage],a or b jr nz,.next ld a,1 - ld [W_MOVEMISSED],a + ld [wMoveMissed],a .next xor a ld [hli],a ld [hl],a ld a,BIDE - ld [W_PLAYERMOVENUM],a + ld [wPlayerMoveNum],a ld hl,handleIfPlayerMoveMissed ; skip damage calculation, DecrementPP and MoveHitTest jp .returnToHL @@ -3593,7 +3593,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) bit ThrashingAbout,[hl] ; is mon using thrash or petal dance? jr z,.MultiturnMoveCheck ld a,THRASH - ld [W_PLAYERMOVENUM],a + ld [wPlayerMoveNum],a ld hl,ThrashingAboutText call PrintText ld hl,wPlayerNumAttacksLeft @@ -3601,14 +3601,14 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) ld hl,PlayerCalcMoveDamage ; skip DecrementPP jp nz,.returnToHL push hl - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 res ThrashingAbout,[hl] ; no longer thrashing about set Confused,[hl] ; confused call BattleRandom and a,3 inc a inc a ; confused for 2-5 turns - ld [W_PLAYERCONFUSEDCOUNTER],a + ld [wPlayerConfusedCounter],a pop hl ; skip DecrementPP jp .returnToHL @@ -3626,7 +3626,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) jp .returnToHL .RageCheck - ld a, [W_PLAYERBATTSTATUS2] + ld a, [wPlayerBattleStatus2] bit UsingRage, a ; is mon using rage? jp z, .checkPlayerStatusConditionsDone ; if we made it this far, mon can move normally this turn ld a, RAGE @@ -3634,7 +3634,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) call GetMoveName call CopyStringToCF4B xor a - ld [W_PLAYERMOVEEFFECT], a + ld [wPlayerMoveEffect], a ld hl, PlayerCanExecuteMove jp .returnToHL @@ -3709,12 +3709,12 @@ CantMoveText: ; 3da83 (f:5a83) PrintMoveIsDisabledText: ; 3da88 (f:5a88) ld hl, wPlayerSelectedMove - ld de, W_PLAYERBATTSTATUS1 + ld de, wPlayerBattleStatus1 ld a, [H_WHOSETURN] and a jr z, .removeChargingUp inc hl - ld de, W_ENEMYBATTSTATUS1 + ld de, wEnemyBattleStatus1 .removeChargingUp ld a, [de] res ChargingUp, a ; end the pokemon's @@ -3741,7 +3741,7 @@ HandleSelfConfusionDamage: ; 3daad (f:5aad) ld [hli], a ld a, [wBattleMonDefense + 1] ld [hl], a - ld hl, W_PLAYERMOVEEFFECT + ld hl, wPlayerMoveEffect push hl ld a, [hl] push af @@ -3787,10 +3787,10 @@ MonName1Text: ; 3dafb (f:5afb) TX_ASM ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] ld hl, wPlayerUsedMove jr z, .asm_3db11 - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] ld hl, wEnemyUsedMove .asm_3db11 ld [hl], a @@ -3921,11 +3921,11 @@ ExclamationPointMoveSets: ; 3dba3 (f:5ba3) db $FF ; terminator PrintMoveFailureText: ; 3dbe2 (f:5be2) - ld de, W_PLAYERMOVEEFFECT + ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] and a jr z, .playersTurn - ld de, W_ENEMYMOVEEFFECT + ld de, wEnemyMoveEffect .playersTurn ld hl, DoesntAffectMonText ld a, [wDamageMultipliers] @@ -3947,7 +3947,7 @@ PrintMoveFailureText: ; 3dbe2 (f:5be2) ret nz ; if you get here, the mon used jump kick or hi jump kick and missed - ld hl, W_DAMAGE ; since the move missed, W_DAMAGE will always contain 0 at this point. + ld hl, wDamage ; since the move missed, wDamage will always contain 0 at this point. ; Thus, recoil damage will always be equal to 1 ; even if it was intended to be potential damage/8. ld a, [hli] @@ -4057,7 +4057,7 @@ CheckForDisobedience: ; 3dc88 (f:5c88) ; it was traded .monIsTraded ; what level might disobey? - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges bit 7, [hl] ld a, 101 jr nz, .next @@ -4234,15 +4234,15 @@ IgnoredOrdersText: ; 3ddca (f:5dca) ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the player mon GetDamageVarsForPlayerAttack: ; 3ddcf (f:5dcf) xor a - ld hl, W_DAMAGE ; damage to eventually inflict, initialise to zero + ld hl, wDamage ; damage to eventually inflict, initialise to zero ldi [hl], a ld [hl], a - ld hl, W_PLAYERMOVEPOWER + ld hl, wPlayerMovePower ld a, [hli] and a ld d, a ; d = move power ret z ; return if move power is zero - ld a, [hl] ; a = [W_PLAYERMOVETYPE] + ld a, [hl] ; a = [wPlayerMoveType] cp FIRE ; types >= FIRE are all special jr nc, .specialAttack .physicalAttack @@ -4250,7 +4250,7 @@ GetDamageVarsForPlayerAttack: ; 3ddcf (f:5dcf) ld a, [hli] ld b, a ld c, [hl] ; bc = enemy defense - ld a, [W_ENEMYBATTSTATUS3] + ld a, [wEnemyBattleStatus3] bit HasReflectUp, a ; check for Reflect jr z, .physicalAttackCritCheck ; if the enemy has used Reflect, double the enemy's defense @@ -4280,7 +4280,7 @@ GetDamageVarsForPlayerAttack: ; 3ddcf (f:5dcf) ld a, [hli] ld b, a ld c, [hl] ; bc = enemy special - ld a, [W_ENEMYBATTSTATUS3] + ld a, [wEnemyBattleStatus3] bit HasLightScreenUp, a ; check for Light Screen jr z, .specialAttackCritCheck ; if the enemy has used Light Screen, double the enemy's special @@ -4346,16 +4346,16 @@ GetDamageVarsForPlayerAttack: ; 3ddcf (f:5dcf) ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the enemy mon GetDamageVarsForEnemyAttack: ; 3de75 (f:5e75) - ld hl, W_DAMAGE ; damage to eventually inflict, initialise to zero + ld hl, wDamage ; damage to eventually inflict, initialise to zero xor a ld [hli], a ld [hl], a - ld hl, W_ENEMYMOVEPOWER + ld hl, wEnemyMovePower ld a, [hli] ld d, a ; d = move power and a ret z ; return if move power is zero - ld a, [hl] ; a = [W_ENEMYMOVETYPE] + ld a, [hl] ; a = [wEnemyMoveType] cp FIRE ; types >= FIRE are all special jr nc, .specialAttack .physicalAttack @@ -4363,7 +4363,7 @@ GetDamageVarsForEnemyAttack: ; 3de75 (f:5e75) ld a, [hli] ld b, a ld c, [hl] ; bc = player defense - ld a, [W_PLAYERBATTSTATUS3] + ld a, [wPlayerBattleStatus3] bit HasReflectUp, a ; check for Reflect jr z, .physicalAttackCritCheck ; if the player has used Reflect, double the player's defense @@ -4393,7 +4393,7 @@ GetDamageVarsForEnemyAttack: ; 3de75 (f:5e75) ld a, [hli] ld b, a ld c, [hl] - ld a, [W_PLAYERBATTSTATUS3] + ld a, [wPlayerBattleStatus3] bit HasLightScreenUp, a ; check for Light Screen jr z, .specialAttackCritCheck ; if the player has used Light Screen, double the player's special @@ -4483,7 +4483,7 @@ GetEnemyMonStat: ; 3df1c (f:5f1c) ret .notLinkBattle ld a, [wEnemyMonLevel] - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, [wEnemyMonSpecies] ld [wd0b5], a call GetMonHeader @@ -4510,9 +4510,9 @@ CalculateDamage: ; 3df65 (f:5f65) ld a, [H_WHOSETURN] ; whose turn? and a - ld a, [W_PLAYERMOVEEFFECT] + ld a, [wPlayerMoveEffect] jr z, .effect - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] .effect ; EXPLODE_EFFECT halves defense. @@ -4589,7 +4589,7 @@ CalculateDamage: ; 3df65 (f:5f65) ld b, 4 call Divide - ld hl, W_DAMAGE + ld hl, wDamage ld b, [hl] ld a, [H_QUOTIENT + 3] add b @@ -4665,7 +4665,7 @@ CalculateDamage: ; 3df65 (f:5f65) JumpToOHKOMoveEffect: ; 3e016 (f:6016) call JumpMoveEffect - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] dec a ret @@ -4692,16 +4692,16 @@ CriticalHitTest: ; 3e023 (f:6023) .asm_3e032 ld [wd0b5], a call GetMonHeader - ld a, [W_MONHBASESPEED] + ld a, [wMonHBaseSpeed] ld b, a srl b ; (effective (base speed/2)) ld a, [H_WHOSETURN] and a - ld hl, W_PLAYERMOVEPOWER - ld de, W_PLAYERBATTSTATUS2 + ld hl, wPlayerMovePower + ld de, wPlayerBattleStatus2 jr z, .calcCriticalHitProbability - ld hl, W_ENEMYMOVEPOWER - ld de, W_ENEMYBATTSTATUS2 + ld hl, wEnemyMovePower + ld de, wEnemyBattleStatus2 .calcCriticalHitProbability ld a, [hld] ; read base power from RAM and a @@ -4768,18 +4768,18 @@ HandleCounterMove: ; 3e093 (f:6093) and a ; player's turn ld hl,wEnemySelectedMove - ld de,W_ENEMYMOVEPOWER + ld de,wEnemyMovePower ld a,[wPlayerSelectedMove] jr z,.next ; enemy's turn ld hl,wPlayerSelectedMove - ld de,W_PLAYERMOVEPOWER + ld de,wPlayerMovePower ld a,[wEnemySelectedMove] .next cp a,COUNTER ret nz ; return if not using Counter ld a,$01 - ld [W_MOVEMISSED],a ; initialize the move missed variable to true (it is set to false below if the move hits) + ld [wMoveMissed],a ; initialize the move missed variable to true (it is set to false below if the move hits) ld a,[hl] cp a,COUNTER ret z ; miss if the opponent's last selected move is Counter. @@ -4797,11 +4797,11 @@ HandleCounterMove: ; 3e093 (f:6093) xor a ret .counterableType - ld hl,W_DAMAGE + ld hl,wDamage ld a,[hli] or [hl] ret z ; If we made it here, Counter still misses if the last move used in battle did no damage to its target. - ; W_DAMAGE is shared by both players, so Counter may strike back damage dealt by the Counter user itself + ; wDamage is shared by both players, so Counter may strike back damage dealt by the Counter user itself ; if the conditions meet, even though 99% of the times damage will come from the target. ; if it did damage, double it ld a,[hl] @@ -4817,27 +4817,27 @@ HandleCounterMove: ; 3e093 (f:6093) ld [hl],a .noCarry xor a - ld [W_MOVEMISSED],a + ld [wMoveMissed],a call MoveHitTest ; do the normal move hit test in addition to Counter's special rules xor a ret ApplyAttackToEnemyPokemon: ; 3e0df (f:60df) - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] cp a,OHKO_EFFECT jr z,ApplyDamageToEnemyPokemon cp a,SUPER_FANG_EFFECT jr z,.superFangEffect cp a,SPECIAL_DAMAGE_EFFECT jr z,.specialDamage - ld a,[W_PLAYERMOVEPOWER] + ld a,[wPlayerMovePower] and a jp z,ApplyAttackToEnemyPokemonDone ; no attack to apply if base power is 0 jr ApplyDamageToEnemyPokemon .superFangEffect ; set the damage to half the target's HP ld hl,wEnemyMonHP - ld de,W_DAMAGE + ld de,wDamage ld a,[hli] srl a ld [de],a @@ -4856,7 +4856,7 @@ ApplyAttackToEnemyPokemon: ; 3e0df (f:60df) ld hl,wBattleMonLevel ld a,[hl] ld b,a ; Seismic Toss deals damage equal to the user's level - ld a,[W_PLAYERMOVENUM] + ld a,[wPlayerMoveNum] cp a,SEISMIC_TOSS jr z,.storeDamage cp a,NIGHT_SHADE @@ -4882,20 +4882,20 @@ ApplyAttackToEnemyPokemon: ; 3e0df (f:60df) jr nc,.loop ld b,a .storeDamage ; store damage value at b - ld hl,W_DAMAGE + ld hl,wDamage xor a ld [hli],a ld a,b ld [hl],a ApplyDamageToEnemyPokemon: ; 3e142 (f:6142) - ld hl,W_DAMAGE + ld hl,wDamage ld a,[hli] ld b,a ld a,[hl] or b jr z,ApplyAttackToEnemyPokemonDone ; we're done if damage is 0 - ld a,[W_ENEMYBATTSTATUS2] + ld a,[wEnemyBattleStatus2] bit HasSubstituteUp,a ; does the enemy have a substitute? jp nz,AttackSubstitute ; subtract the damage from the pokemon's current HP @@ -4913,7 +4913,7 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142) sbc b ld [wEnemyMonHP],a jr nc,.animateHpBar -; if more damage was done than the current HP, zero the HP and set the damage (W_DAMAGE) +; if more damage was done than the current HP, zero the HP and set the damage (wDamage) ; equal to how much HP the pokemon had before the attack ld a,[wHPBarOldHP+1] ld [hli],a @@ -4942,21 +4942,21 @@ ApplyAttackToEnemyPokemonDone: ; 3e19d (f:619d) jp DrawHUDsAndHPBars ApplyAttackToPlayerPokemon: ; 3e1a0 (f:61a0) - ld a,[W_ENEMYMOVEEFFECT] + ld a,[wEnemyMoveEffect] cp a,OHKO_EFFECT jr z,ApplyDamageToPlayerPokemon cp a,SUPER_FANG_EFFECT jr z,.superFangEffect cp a,SPECIAL_DAMAGE_EFFECT jr z,.specialDamage - ld a,[W_ENEMYMOVEPOWER] + ld a,[wEnemyMovePower] and a jp z,ApplyAttackToPlayerPokemonDone jr ApplyDamageToPlayerPokemon .superFangEffect ; set the damage to half the target's HP ld hl,wBattleMonHP - ld de,W_DAMAGE + ld de,wDamage ld a,[hli] srl a ld [de],a @@ -4975,7 +4975,7 @@ ApplyAttackToPlayerPokemon: ; 3e1a0 (f:61a0) ld hl,wEnemyMonLevel ld a,[hl] ld b,a - ld a,[W_ENEMYMOVENUM] + ld a,[wEnemyMoveNum] cp a,SEISMIC_TOSS jr z,.storeDamage cp a,NIGHT_SHADE @@ -5001,20 +5001,20 @@ ApplyAttackToPlayerPokemon: ; 3e1a0 (f:61a0) jr nc,.loop ld b,a .storeDamage - ld hl,W_DAMAGE + ld hl,wDamage xor a ld [hli],a ld a,b ld [hl],a ApplyDamageToPlayerPokemon: ; 3e200 (f:6200) - ld hl,W_DAMAGE + ld hl,wDamage ld a,[hli] ld b,a ld a,[hl] or b jr z,ApplyAttackToPlayerPokemonDone ; we're done if damage is 0 - ld a,[W_PLAYERBATTSTATUS2] + ld a,[wPlayerBattleStatus2] bit HasSubstituteUp,a ; does the player have a substitute? jp nz,AttackSubstitute ; subtract the damage from the pokemon's current HP @@ -5033,7 +5033,7 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200) ld [wBattleMonHP],a ld [wHPBarNewHP+1],a jr nc,.animateHpBar -; if more damage was done than the current HP, zero the HP and set the damage (W_DAMAGE) +; if more damage was done than the current HP, zero the HP and set the damage (wDamage) ; equal to how much HP the pokemon had before the attack ld a,[wHPBarOldHP+1] ld [hli],a @@ -5071,15 +5071,15 @@ AttackSubstitute: ; 3e25e (f:625e) call PrintText ; values for player turn ld de,wEnemySubstituteHP - ld bc,W_ENEMYBATTSTATUS2 + ld bc,wEnemyBattleStatus2 ld a,[H_WHOSETURN] and a jr z,.applyDamageToSubstitute ; values for enemy turn ld de,wPlayerSubstituteHP - ld bc,W_PLAYERBATTSTATUS2 + ld bc,wPlayerBattleStatus2 .applyDamageToSubstitute - ld hl,W_DAMAGE + ld hl,wDamage ld a,[hli] and a jr nz,.substituteBroke ; damage > 0xFF always breaks substitutes @@ -5089,7 +5089,7 @@ AttackSubstitute: ; 3e25e (f:625e) ld [de],a ret nc .substituteBroke -; If the target's Substitute breaks, W_DAMAGE isn't updated with the amount of HP +; If the target's Substitute breaks, wDamage isn't updated with the amount of HP ; the Substitute had before being attacked. ld h,b ld l,c @@ -5105,10 +5105,10 @@ AttackSubstitute: ; 3e25e (f:625e) ld a,[H_WHOSETURN] xor a,$01 ld [H_WHOSETURN],a - ld hl,W_PLAYERMOVEEFFECT ; value for player's turn + ld hl,wPlayerMoveEffect ; value for player's turn and a jr z,.nullifyEffect - ld hl,W_ENEMYMOVEEFFECT ; value for enemy's turn + ld hl,wEnemyMoveEffect ; value for enemy's turn .nullifyEffect xor a ld [hl],a ; zero the effect of the attacker's move @@ -5125,16 +5125,16 @@ SubstituteBrokeText: ; 3e2b1 (f:62b1) ; this function raises the attack modifier of a pokemon using Rage when that pokemon is attacked HandleBuildingRage: ; 3e2b6 (f:62b6) ; values for the player turn - ld hl,W_ENEMYBATTSTATUS2 + ld hl,wEnemyBattleStatus2 ld de,wEnemyMonStatMods - ld bc,W_ENEMYMOVENUM + ld bc,wEnemyMoveNum ld a,[H_WHOSETURN] and a jr z,.next ; values for the enemy turn - ld hl,W_PLAYERBATTSTATUS2 + ld hl,wPlayerBattleStatus2 ld de,wPlayerMonStatMods - ld bc,W_PLAYERMOVENUM + ld bc,wPlayerMoveNum .next bit UsingRage,[hl] ; is the pokemon being attacked under the effect of Rage? ret z ; return if not @@ -5183,11 +5183,11 @@ MirrorMoveCopyMove: ; 3e2fd (f:62fd) ; values for player turn ld a,[wEnemyUsedMove] ld hl,wPlayerSelectedMove - ld de,W_PLAYERMOVENUM + ld de,wPlayerMoveNum jr z,.next ; values for enemy turn ld a,[wPlayerUsedMove] - ld de,W_ENEMYMOVENUM + ld de,wEnemyMoveNum ld hl,wEnemySelectedMove .next ld [hl],a @@ -5229,13 +5229,13 @@ MetronomePickMove: ; 3e348 (f:6348) ld a,METRONOME call PlayMoveAnimation ; play Metronome's animation ; values for player turn - ld de,W_PLAYERMOVENUM + ld de,wPlayerMoveNum ld hl,wPlayerSelectedMove ld a,[H_WHOSETURN] and a jr z,.pickMoveLoop ; values for enemy turn - ld de,W_ENEMYMOVENUM + ld de,wEnemyMoveNum ld hl,wEnemySelectedMove ; loop to pick a random number in the range [1, $a5) to be the move used by Metronome .pickMoveLoop @@ -5294,7 +5294,7 @@ AdjustDamageForMoveType: ; 3e3a5 (f:63a5) ld a,[hli] ld d,a ; d = type 1 of defender ld e,[hl] ; e = type 2 of defender - ld a,[W_PLAYERMOVETYPE] + ld a,[wPlayerMoveType] ld [wMoveType],a ld a,[H_WHOSETURN] and a @@ -5308,7 +5308,7 @@ AdjustDamageForMoveType: ; 3e3a5 (f:63a5) ld a,[hli] ld d,a ; d = type 1 of defender ld e,[hl] ; e = type 2 of defender - ld a,[W_ENEMYMOVETYPE] + ld a,[wEnemyMoveType] ld [wMoveType],a .next ld a,[wMoveType] @@ -5319,7 +5319,7 @@ AdjustDamageForMoveType: ; 3e3a5 (f:63a5) jr .skipSameTypeAttackBonus .sameTypeAttackBonus ; if the move type matches one of the attacker's types - ld hl,W_DAMAGE + 1 + ld hl,wDamage + 1 ld a,[hld] ld h,[hl] ld l,a ; hl = damage @@ -5330,9 +5330,9 @@ AdjustDamageForMoveType: ; 3e3a5 (f:63a5) add hl,bc ; hl = floor(1.5 * damage) ; store damage ld a,h - ld [W_DAMAGE],a + ld [wDamage],a ld a,l - ld [W_DAMAGE + 1],a + ld [wDamage + 1],a ld hl,wDamageMultipliers set 7,[hl] .skipSameTypeAttackBonus @@ -5365,7 +5365,7 @@ AdjustDamageForMoveType: ; 3e3a5 (f:63a5) ld [wDamageMultipliers],a xor a ld [H_MULTIPLICAND],a - ld hl,W_DAMAGE + ld hl,wDamage ld a,[hli] ld [H_MULTIPLICAND + 1],a ld a,[hld] @@ -5386,7 +5386,7 @@ AdjustDamageForMoveType: ; 3e3a5 (f:63a5) ; if damage is 0, make the move miss ; this only occurs if a move that would do 2 or 3 damage is 0.25x effective against the target inc a - ld [W_MOVEMISSED],a + ld [wMoveMissed],a .skipTypeImmunity pop bc pop hl @@ -5404,7 +5404,7 @@ AdjustDamageForMoveType: ; 3e3a5 (f:63a5) ; ($05 is not very effective, $10 is neutral, $14 is super effective) ; as far is can tell, this is only used once in some AI code to help decide which move to use AIGetTypeEffectiveness: ; 3e449 (f:6449) - ld a,[W_ENEMYMOVETYPE] + ld a,[wEnemyMoveType] ld d,a ; d = type of enemy move ld hl,wBattleMonType ld b,[hl] ; b = type 1 of player's pokemon @@ -5440,15 +5440,15 @@ INCLUDE "data/type_effects.asm" ; some tests that need to pass for a move to hit MoveHitTest: ; 3e56b (f:656b) ; player's turn - ld hl,W_ENEMYBATTSTATUS1 - ld de,W_PLAYERMOVEEFFECT + ld hl,wEnemyBattleStatus1 + ld de,wPlayerMoveEffect ld bc,wEnemyMonStatus ld a,[H_WHOSETURN] and a jr z,.dreamEaterCheck ; enemy's turn - ld hl,W_PLAYERBATTSTATUS1 - ld de,W_ENEMYMOVEEFFECT + ld hl,wPlayerBattleStatus1 + ld de,wEnemyMoveEffect ld bc,wBattleMonStatus .dreamEaterCheck ld a,[de] @@ -5477,7 +5477,7 @@ MoveHitTest: ; 3e56b (f:656b) jr nz,.enemyTurn .playerTurn ; this checks if the move effect is disallowed by mist - ld a,[W_PLAYERMOVEEFFECT] + ld a,[wPlayerMoveEffect] cp a,ATTACK_DOWN1_EFFECT jr c,.skipEnemyMistCheck cp a,HAZE_EFFECT + 1 @@ -5494,16 +5494,16 @@ MoveHitTest: ; 3e56b (f:656b) ; FLASH, CONVERSION*, HAZE*, SCREECH, LIGHT SCREEN*, REFLECT* ; the moves that are marked with an asterisk are not affected since this ; function is not called when those moves are used - ld a,[W_ENEMYBATTSTATUS2] + ld a,[wEnemyBattleStatus2] bit ProtectedByMist,a ; is mon protected by mist? jp nz,.moveMissed .skipEnemyMistCheck - ld a,[W_PLAYERBATTSTATUS2] + ld a,[wPlayerBattleStatus2] bit UsingXAccuracy,a ; is the player using X Accuracy? ret nz ; if so, always hit regardless of accuracy/evasion jr .calcHitChance .enemyTurn - ld a,[W_ENEMYMOVEEFFECT] + ld a,[wEnemyMoveEffect] cp a,ATTACK_DOWN1_EFFECT jr c,.skipPlayerMistCheck cp a,HAZE_EFFECT + 1 @@ -5515,21 +5515,21 @@ MoveHitTest: ; 3e56b (f:656b) jr .skipPlayerMistCheck .playerMistCheck ; similar to enemy mist check - ld a,[W_PLAYERBATTSTATUS2] + ld a,[wPlayerBattleStatus2] bit ProtectedByMist,a ; is mon protected by mist? jp nz,.moveMissed .skipPlayerMistCheck - ld a,[W_ENEMYBATTSTATUS2] + ld a,[wEnemyBattleStatus2] bit UsingXAccuracy,a ; is the enemy using X Accuracy? ret nz ; if so, always hit regardless of accuracy/evasion .calcHitChance call CalcHitChance ; scale the move accuracy according to attacker's accuracy and target's evasion - ld a,[W_PLAYERMOVEACCURACY] + ld a,[wPlayerMoveAccuracy] ld b,a ld a,[H_WHOSETURN] and a jr z,.doAccuracyCheck - ld a,[W_ENEMYMOVEACCURACY] + ld a,[wEnemyMoveAccuracy] ld b,a .doAccuracyCheck ; if the random number generated is greater than or equal to the scaled accuracy, the move misses @@ -5540,26 +5540,26 @@ MoveHitTest: ; 3e56b (f:656b) ret .moveMissed xor a - ld hl,W_DAMAGE ; zero the damage + ld hl,wDamage ; zero the damage ld [hli],a ld [hl],a inc a - ld [W_MOVEMISSED],a + ld [wMoveMissed],a ld a,[H_WHOSETURN] and a jr z,.playerTurn2 .enemyTurn2 - ld hl,W_ENEMYBATTSTATUS1 + ld hl,wEnemyBattleStatus1 res UsingTrappingMove,[hl] ; end multi-turn attack e.g. wrap ret .playerTurn2 - ld hl,W_PLAYERBATTSTATUS1 + ld hl,wPlayerBattleStatus1 res UsingTrappingMove,[hl] ; end multi-turn attack e.g. wrap ret ; values for player turn CalcHitChance: ; 3e624 (f:6624) - ld hl,W_PLAYERMOVEACCURACY + ld hl,wPlayerMoveAccuracy ld a,[H_WHOSETURN] and a ld a,[wPlayerMonAccuracyMod] @@ -5568,7 +5568,7 @@ CalcHitChance: ; 3e624 (f:6624) ld c,a jr z,.next ; values for enemy turn - ld hl,W_ENEMYMOVEACCURACY + ld hl,wEnemyMoveAccuracy ld a,[wEnemyMonAccuracyMod] ld b,a ld a,[wPlayerMonEvasionMod] @@ -5631,7 +5631,7 @@ CalcHitChance: ; 3e624 (f:6624) ; multiplies damage by a random percentage from ~85% to 100% RandomizeDamage: ; 3e687 (f:6687) - ld hl, W_DAMAGE + ld hl, wDamage ld a, [hli] and a jr nz, .DamageGreaterThanOne @@ -5660,7 +5660,7 @@ RandomizeDamage: ; 3e687 (f:6687) call Divide ; divide the result by 255 ; store the modified damage ld a, [H_QUOTIENT + 2] - ld hl, W_DAMAGE + ld hl, wDamage ld [hli], a ld a, [H_QUOTIENT + 3] ld [hl], a @@ -5686,7 +5686,7 @@ ExecuteEnemyMove: ; 3e6bc (f:66bc) ld hl, wAILayer2Encouragement inc [hl] xor a - ld [W_MOVEMISSED], a + ld [wMoveMissed], a ld [wMoveDidntMiss], a ld a, $a ld [wDamageMultipliers], a @@ -5694,23 +5694,23 @@ ExecuteEnemyMove: ; 3e6bc (f:66bc) jr nz, .enemyHasNoSpecialConditions jp [hl] .enemyHasNoSpecialConditions - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 bit ChargingUp, [hl] ; is the enemy charging up for attack? jr nz, EnemyCanExecuteChargingMove ; if so, jump call GetCurrentMove CheckIfEnemyNeedsToChargeUp: ; 3e6fc (f:66fc) - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] cp CHARGE_EFFECT jp z, JumpMoveEffect cp FLY_EFFECT jp z, JumpMoveEffect jr EnemyCanExecuteMove EnemyCanExecuteChargingMove: ; 3e70b (f:670b) - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 res ChargingUp, [hl] ; no longer charging up for attack res Invulnerable, [hl] ; no longer invulnerable to typical attacks - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] ld [wd0b5], a ld a, BANK(MoveNames) ld [wPredefBank], a @@ -5723,19 +5723,19 @@ EnemyCanExecuteMove: ; 3e72b (f:672b) xor a ld [wMonIsDisobedient], a call PrintMonName1Text - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] ld hl, ResidualEffects1 ld de, $1 call IsInArray jp c, JumpMoveEffect - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] ld hl, SpecialEffectsCont ld de, $1 call IsInArray call c, JumpMoveEffect EnemyCalcMoveDamage: ; 3e750 (f:6750) call SwapPlayerAndEnemyLevels - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] ld hl, SetDamageEffects ld de, $1 call IsInArray @@ -5754,10 +5754,10 @@ EnemyCalcMoveDamage: ; 3e750 (f:6750) EnemyMoveHitTest: ; 3e77f (f:677f) call MoveHitTest handleIfEnemyMoveMissed: ; 3e782 (f:6782) - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr z, .asm_3e791 - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] cp EXPLODE_EFFECT jr z, asm_3e7a0 jr EnemyCheckIfFlyOrChargeEffect @@ -5765,7 +5765,7 @@ handleIfEnemyMoveMissed: ; 3e782 (f:6782) call SwapPlayerAndEnemyLevels GetEnemyAnimationType: ; 3e794 (f:6794) - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] and a ld a, $1 jr z, playEnemyMoveAnimation @@ -5776,18 +5776,18 @@ asm_3e7a0: ; 3e7a0 (f:67a0) xor a playEnemyMoveAnimation: ; 3e7a4 (f:67a4) push af - ld a, [W_ENEMYBATTSTATUS2] + ld a, [wEnemyBattleStatus2] bit HasSubstituteUp, a ; does mon have a substitute? ld hl, HideSubstituteShowMonAnim ld b, BANK(HideSubstituteShowMonAnim) call nz, Bankswitch pop af ld [wAnimationType], a - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] call PlayMoveAnimation call HandleExplodingAnimation call DrawEnemyHUDAndHPBar - ld a, [W_ENEMYBATTSTATUS2] + ld a, [wEnemyBattleStatus2] bit HasSubstituteUp, a ; does mon have a substitute? ld hl, ReshowSubstituteAnim ld b, BANK(ReshowSubstituteAnim) @@ -5798,7 +5798,7 @@ EnemyCheckIfFlyOrChargeEffect: ; 3e7d1 (f:67d1) call SwapPlayerAndEnemyLevels ld c, 30 call DelayFrames - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] cp FLY_EFFECT jr z, .playAnim cp CHARGE_EFFECT @@ -5810,7 +5810,7 @@ EnemyCheckIfFlyOrChargeEffect: ; 3e7d1 (f:67d1) ld a,STATUS_AFFECTED_ANIM call PlayMoveAnimation EnemyCheckIfMirrorMoveEffect: ; 3e7ef (f:67ef) - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] cp MIRROR_MOVE_EFFECT jr nz, .notMirrorMoveEffect call MirrorMoveCopyMove @@ -5822,16 +5822,16 @@ EnemyCheckIfMirrorMoveEffect: ; 3e7ef (f:67ef) call MetronomePickMove jp CheckIfEnemyNeedsToChargeUp .notMetronomeEffect - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] ld hl, ResidualEffects2 ld de, $1 call IsInArray jp c, JumpMoveEffect - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr z, .asm_3e82b call PrintMoveFailureText - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] cp EXPLODE_EFFECT jr z, .asm_3e83e jp ExecuteEnemyMoveDone @@ -5842,7 +5842,7 @@ EnemyCheckIfMirrorMoveEffect: ; 3e7ef (f:67ef) ld a, 1 ld [wMoveDidntMiss], a .asm_3e83e - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] ld hl, AlwaysHappenSideEffects ld de, $1 call IsInArray @@ -5853,7 +5853,7 @@ EnemyCheckIfMirrorMoveEffect: ; 3e7ef (f:67ef) or b ret z call HandleBuildingRage - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 bit AttackingMultipleTimes, [hl] ; is mon hitting multiple times? (example: double kick) jr z, .asm_3e873 push hl @@ -5867,7 +5867,7 @@ EnemyCheckIfMirrorMoveEffect: ; 3e7ef (f:67ef) xor a ld [wEnemyNumHits], a .asm_3e873 - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] and a jr z, ExecuteEnemyMoveDone ld hl, SpecialEffects @@ -5920,7 +5920,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld hl, ExecuteEnemyMoveDone ; enemy can't move this turn jp .enemyReturnToHL .checkIfTrapped - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] bit UsingTrappingMove, a ; is the player using a multi-turn attack like warp jp z, .checkIfFlinched ld hl, CantMoveText @@ -5928,7 +5928,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld hl, ExecuteEnemyMoveDone ; enemy can't move this turn jp .enemyReturnToHL .checkIfFlinched - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 bit Flinched, [hl] ; check if enemy mon flinched jp z, .checkIfMustRecharge res Flinched, [hl] @@ -5937,7 +5937,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld hl, ExecuteEnemyMoveDone ; enemy can't move this turn jp .enemyReturnToHL .checkIfMustRecharge - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 bit NeedsToRecharge, [hl] ; check if enemy mon has to recharge after using a move jr z, .checkIfAnyMoveDisabled res NeedsToRecharge, [hl] @@ -5946,7 +5946,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld hl, ExecuteEnemyMoveDone ; enemy can't move this turn jp .enemyReturnToHL .checkIfAnyMoveDisabled - ld hl, W_ENEMYDISABLEDMOVE + ld hl, wEnemyDisabledMove ld a, [hl] and a jr z, .checkIfConfused @@ -5959,13 +5959,13 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld hl, DisabledNoMoreText call PrintText .checkIfConfused - ld a, [W_ENEMYBATTSTATUS1] + ld a, [wEnemyBattleStatus1] add a ; check if enemy mon is confused jp nc, .checkIfTriedToUseDisabledMove - ld hl, W_ENEMYCONFUSEDCOUNTER + ld hl, wEnemyConfusedCounter dec [hl] jr nz, .isConfused - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 res Confused, [hl] ; if confused counter hit 0, reset confusion status ld hl, ConfusedNoMoreText call PrintText @@ -5980,9 +5980,9 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) call BattleRandom cp $80 jr c, .checkIfTriedToUseDisabledMove - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 ld a, [hl] - and 1 << Confused ; if mon hurts itself, clear every other status from W_ENEMYBATTSTATUS1 + and 1 << Confused ; if mon hurts itself, clear every other status from wEnemyBattleStatus1 ld [hl], a ld hl, HurtItselfText call PrintText @@ -5995,7 +5995,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld [hli], a ld a, [wEnemyMonDefense + 1] ld [hl], a - ld hl, W_ENEMYMOVEEFFECT + ld hl, wEnemyMoveEffect push hl ld a, [hl] push af @@ -6046,12 +6046,12 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld hl, FullyParalyzedText call PrintText .monHurtItselfOrFullyParalysed - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 ld a, [hl] ; clear bide, thrashing about, charging up, and multi-turn moves such as warp and $ff ^ ((1 << StoringEnergy) | (1 << ThrashingAbout) | (1 << ChargingUp) | (1 << UsingTrappingMove)) ld [hl], a - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] cp FLY_EFFECT jr z, .flyOrChargeEffect cp CHARGE_EFFECT @@ -6066,12 +6066,12 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld hl, ExecuteEnemyMoveDone jp .enemyReturnToHL ; if using a two-turn move, enemy needs to recharge the first turn .checkIfUsingBide - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 bit StoringEnergy, [hl] ; is mon using bide? jr z, .checkIfThrashingAbout xor a - ld [W_ENEMYMOVENUM], a - ld hl, W_DAMAGE + ld [wEnemyMoveNum], a + ld hl, wDamage ld a, [hli] ld b, a ld c, [hl] @@ -6088,30 +6088,30 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld hl, ExecuteEnemyMoveDone jp .enemyReturnToHL ; unless mon unleashes energy, can't move this turn .unleashEnergy - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 res StoringEnergy, [hl] ; not using bide any more ld hl, UnleashedEnergyText call PrintText ld a, $1 - ld [W_ENEMYMOVEPOWER], a + ld [wEnemyMovePower], a ld hl, wEnemyBideAccumulatedDamage + 1 ld a, [hld] add a ld b, a - ld [W_DAMAGE + 1], a + ld [wDamage + 1], a ld a, [hl] rl a ; double the damage - ld [W_DAMAGE], a + ld [wDamage], a or b jr nz, .next ld a, $1 - ld [W_MOVEMISSED], a + ld [wMoveMissed], a .next xor a ld [hli], a ld [hl], a ld a, BIDE - ld [W_ENEMYMOVENUM], a + ld [wEnemyMoveNum], a call SwapPlayerAndEnemyLevels ld hl, handleIfEnemyMoveMissed ; skip damage calculation, DecrementPP and MoveHitTest jp .enemyReturnToHL @@ -6119,7 +6119,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) bit ThrashingAbout, [hl] ; is mon using thrash or petal dance? jr z, .checkIfUsingMultiturnMove ld a, THRASH - ld [W_ENEMYMOVENUM], a + ld [wEnemyMoveNum], a ld hl, ThrashingAboutText call PrintText ld hl, wEnemyNumAttacksLeft @@ -6127,14 +6127,14 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld hl, EnemyCalcMoveDamage ; skip DecrementPP jp nz, .enemyReturnToHL push hl - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 res ThrashingAbout, [hl] ; mon is no longer using thrash or petal dance set Confused, [hl] ; mon is now confused call BattleRandom and $3 inc a inc a ; confused for 2-5 turns - ld [W_ENEMYCONFUSEDCOUNTER], a + ld [wEnemyConfusedCounter], a pop hl ; skip DecrementPP jp .enemyReturnToHL .checkIfUsingMultiturnMove @@ -6149,7 +6149,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) jp nz, .enemyReturnToHL jp .enemyReturnToHL .checkIfUsingRage - ld a, [W_ENEMYBATTSTATUS2] + ld a, [wEnemyBattleStatus2] bit UsingRage, a ; is mon using rage? jp z, .checkEnemyStatusConditionsDone ; if we made it this far, mon can move normally this turn ld a, RAGE @@ -6157,7 +6157,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) call GetMoveName call CopyStringToCF4B xor a - ld [W_ENEMYMOVEEFFECT], a + ld [wEnemyMoveEffect], a ld hl, EnemyCanExecuteMove jp .enemyReturnToHL .enemyReturnToHL @@ -6172,12 +6172,12 @@ GetCurrentMove: ; 3eabe (f:6abe) ld a, [H_WHOSETURN] and a jp z, .player - ld de, W_ENEMYMOVENUM + ld de, wEnemyMoveNum ld a, [wEnemySelectedMove] jr .selected .player - ld de, W_PLAYERMOVENUM - ld a, [W_FLAGS_D733] + ld de, wPlayerMoveNum + ld a, [wFlags_D733] bit BIT_TEST_BATTLE, a ld a, [wTestBattlePlayerSelectedMove] jr nz, .selected @@ -6207,13 +6207,13 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) ld [wEnemyMonSpecies], a ld [wd0b5], a call GetMonHeader - ld a, [W_ENEMYBATTSTATUS3] + ld a, [wEnemyBattleStatus3] bit Transformed, a ; is enemy mon transformed? ld hl, wTransformedEnemyMonOriginalDVs ; original DVs before transforming ld a, [hli] ld b, [hl] jr nz, .storeDVs - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $2 ; is it a trainer battle? ; fixed DVs for trainer mon ld a, $98 @@ -6228,7 +6228,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) ld [hli], a ld [hl], b ld de, wEnemyMonLevel - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] ld [de], a inc de ld b, $0 @@ -6236,10 +6236,10 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) push hl call CalcStats pop hl - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $2 ; is it a trainer battle? jr z, .copyHPAndStatusFromPartyData - ld a, [W_ENEMYBATTSTATUS3] + ld a, [wEnemyBattleStatus3] bit Transformed, a ; is enemy mon transformed? jr nz, .copyTypes ; if transformed, jump ; if it's a wild mon and not transformed, init the current HP to max HP and the status to 0 @@ -6268,7 +6268,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) ld [wEnemyMonStatus], a jr .copyTypes .copyTypes - ld hl, W_MONHTYPES + ld hl, wMonHTypes ld de, wEnemyMonType ld a, [hli] ; copy type 1 ld [de], a @@ -6279,7 +6279,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) ld a, [hli] ; copy catch rate ld [de], a inc de - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $2 ; is it a trainer battle? jr nz, .copyStandardMoves ; if it's a trainer battle, copy moves from enemy party data @@ -6292,7 +6292,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) jr .loadMovePPs .copyStandardMoves ; for a wild mon, first copy default moves from the mon header - ld hl, W_MONHMOVES + ld hl, wMonHMoves ld a, [hli] ld [de], a inc de @@ -6314,7 +6314,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) ld hl, wEnemyMonMoves ld de, wEnemyMonPP - 1 predef LoadMovePPs - ld hl, W_MONHBASESTATS + ld hl, wMonHBaseStats ld de, wEnemyMonBaseStats ld b, NUM_STATS .copyBaseStatsLoop @@ -6323,7 +6323,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) inc de dec b jr nz, .copyBaseStatsLoop - ld hl, W_MONHCATCHRATE + ld hl, wMonHCatchRate ld a, [hli] ld [de], a inc de @@ -6391,7 +6391,7 @@ DoBattleTransitionAndInitBattleVariables: ; 3ec32 (f:6c32) ld [hli], a ld [hli], a ld [hl], a - ld [W_PLAYERDISABLEDMOVE], a + ld [wPlayerDisabledMove], a ret ; swaps the level values of the BattleMon and EnemyMon structs @@ -6410,7 +6410,7 @@ SwapPlayerAndEnemyLevels: ; 3ec81 (f:6c81) ; also writes OAM data and loads tile patterns for the Red or Old Man back sprite's head ; (for use when scrolling the player sprite and enemy's silhouettes on screen) LoadPlayerBackPic: ; 3ec92 (f:6c92) - ld a, [W_BATTLETYPE] + ld a, [wBattleType] dec a ; is it the old man tutorial? ld de, RedPicBack jr nz, .next @@ -6664,7 +6664,7 @@ ApplyBadgeStatBoosts: ; 3ee19 (f:6e19) ld a, [wLinkState] cp LINK_STATE_BATTLING ret z ; return if link battle - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] ld b, a ld hl, wBattleMonAttack ld c, $4 @@ -6804,12 +6804,12 @@ HandleExplodingAnimation: ; 3eed3 (f:6ed3) ld a, [H_WHOSETURN] and a ld hl, wEnemyMonType1 - ld de, W_ENEMYBATTSTATUS1 - ld a, [W_PLAYERMOVENUM] + ld de, wEnemyBattleStatus1 + ld a, [wPlayerMoveNum] jr z, .asm_3eeea ld hl, wBattleMonType1 - ld de, W_ENEMYBATTSTATUS1 - ld a, [W_ENEMYMOVENUM] + ld de, wEnemyBattleStatus1 + ld a, [wEnemyMoveNum] .asm_3eeea cp SELFDESTRUCT jr z, .asm_3eef1 @@ -6825,24 +6825,24 @@ HandleExplodingAnimation: ; 3eed3 (f:6ed3) ld a, [hl] cp GHOST ret z - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a ret nz ld a, 5 ld [wAnimationType], a PlayMoveAnimation: ; 3ef07 (f:6f07) - ld [W_ANIMATIONID],a + ld [wAnimationID],a call Delay3 predef_jump MoveAnimation InitBattle: ; 3ef12 (f:6f12) - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] and a jr z, DetermineWildOpponent InitOpponent: ; 3ef18 (f:6f18) - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] ld [wcf91], a ld [wEnemyMonSpecies2], a jr InitBattleCommon @@ -6871,7 +6871,7 @@ InitBattleCommon: ; 3ef3d (f:6f3d) ld a, [wEnemyMonSpecies2] sub 200 jp c, InitWildBattle - ld [W_TRAINERCLASS], a + ld [wTrainerClass], a call GetTrainerInformation callab ReadTrainer call DoBattleTransitionAndInitBattleVariables @@ -6886,21 +6886,21 @@ InitBattleCommon: ; 3ef3d (f:6f3d) ld a, $ff ld [wEnemyMonPartyPos], a ld a, $2 - ld [W_ISINBATTLE], a + ld [wIsInBattle], a jp _InitBattleCommon InitWildBattle: ; 3ef8b (f:6f8b) ld a, $1 - ld [W_ISINBATTLE], a + ld [wIsInBattle], a call LoadEnemyMonData call DoBattleTransitionAndInitBattleVariables - ld a, [W_CUROPPONENT] + ld a, [wCurOpponent] cp MAROWAK jr z, .isGhost call IsGhostBattle jr nz, .isNoGhost .isGhost - ld hl, W_MONHSPRITEDIM + ld hl, wMonHSpriteDim ld a, $66 ld [hli], a ; write sprite dimensions ld bc, GhostPic @@ -6933,7 +6933,7 @@ InitWildBattle: ; 3ef8b (f:6f8b) call LoadMonFrontSprite ; load mon sprite .spriteLoaded xor a - ld [W_TRAINERCLASS], a + ld [wTrainerClass], a ld [hStartTileID], a coord hl, 12, 0 predef CopyUncompressedPicToTilemap @@ -6964,7 +6964,7 @@ _InitBattleCommon: ; 3efeb (f:6feb) lb bc, 4, 10 call ClearScreenArea call ClearSprites - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a ; is it a wild battle? call z, DrawEnemyHUDAndHPBar ; draw enemy HUD and HP bar if it's a wild battle call StartBattle @@ -7014,7 +7014,7 @@ AnimateSendingOutMon: ; 3f073 (f:7073) ld a, [hStartTileID] ld [hBaseTileID], a ld b, $4c - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a jr z, .notInBattle add b @@ -7056,7 +7056,7 @@ CopyUncompressedPicToHL: ; 3f0d0 (f:70d0) lb bc, 7, 7 ld de, SCREEN_WIDTH push af - ld a, [W_SPRITEFLIPPED] + ld a, [wSpriteFlipped] and a jr nz, .flipped pop af @@ -7108,7 +7108,7 @@ LoadMonBackPic: ; 3f103 (f:7103) ld b, 7 ld c, 8 call ClearScreenArea - ld hl, W_MONHBACKSPRITE - W_MONHEADER + ld hl, wMonHBackSprite - wMonHeader call UncompressMonSprite predef ScaleSpriteByTwo ld de, vBackPic @@ -7128,9 +7128,9 @@ JumpMoveEffect: ; 3f132 (f:7132) _JumpMoveEffect: ; 3f138 (f:7138) ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVEEFFECT] + ld a, [wPlayerMoveEffect] jr z, .next1 - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] .next1 dec a ; subtract 1, there is no special effect for 00 add a ; x2, 16bit pointers @@ -7233,12 +7233,12 @@ MoveEffectPointerTable: ; 3f150 (f:7150) SleepEffect: ; 3f1fc (f:71fc) ld de, wEnemyMonStatus - ld bc, W_ENEMYBATTSTATUS2 + ld bc, wEnemyBattleStatus2 ld a, [H_WHOSETURN] and a jp z, .sleepEffect ld de, wBattleMonStatus - ld bc, W_PLAYERBATTSTATUS2 + ld bc, wPlayerBattleStatus2 .sleepEffect ld a, [bc] @@ -7260,7 +7260,7 @@ SleepEffect: ; 3f1fc (f:71fc) push de call MoveHitTest ; apply accuracy tests pop de - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr nz, .didntAffect .setSleepCounter @@ -7285,12 +7285,12 @@ AlreadyAsleepText: ; 3f24a (f:724a) PoisonEffect: ; 3f24f (f:724f) ld hl, wEnemyMonStatus - ld de, W_PLAYERMOVEEFFECT + ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] and a jr z, .poisonEffect ld hl, wBattleMonStatus - ld de, W_ENEMYMOVEEFFECT + ld de, wEnemyMoveEffect .poisonEffect call CheckTargetSubstitute jr nz, .noEffect ; can't posion a substitute target @@ -7316,7 +7316,7 @@ PoisonEffect: ; 3f24f (f:724f) call MoveHitTest ; apply accuracy tests pop de pop hl - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr nz, .didntAffect jr .inflictPoison @@ -7332,13 +7332,13 @@ PoisonEffect: ; 3f24f (f:724f) ld a, [H_WHOSETURN] and a ld b, ANIM_C7 - ld hl, W_PLAYERBATTSTATUS3 + ld hl, wPlayerBattleStatus3 ld a, [de] - ld de, W_PLAYERTOXICCOUNTER + ld de, wPlayerToxicCounter jr nz, .ok ld b, ANIM_A9 - ld hl, W_ENEMYBATTSTATUS3 - ld de, W_ENEMYTOXICCOUNTER + ld hl, wEnemyBattleStatus3 + ld de, wEnemyToxcCounter .ok cp TOXIC jr nz, .normalPoison ; done if move is not Toxic @@ -7382,12 +7382,12 @@ DrainHPEffect: ; 3f2e9 (f:72e9) ExplodeEffect: ; 3f2f1 (f:72f1) ld hl, wBattleMonHP - ld de, W_PLAYERBATTSTATUS2 + ld de, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .faintUser ld hl, wEnemyMonHP - ld de, W_ENEMYBATTSTATUS2 + ld de, wEnemyBattleStatus2 .faintUser xor a ld [hli], a ; set the mon's HP to 0 @@ -7410,7 +7410,7 @@ FreezeBurnParalyzeEffect: ; 3f30c (f:730c) ld a, [wEnemyMonStatus] and a jp nz, CheckDefrost ; can't inflict status if opponent is already statused - ld a, [W_PLAYERMOVETYPE] + ld a, [wPlayerMoveType] ld b, a ld a, [wEnemyMonType1] cp b ; do target type 1 and move type match? @@ -7418,7 +7418,7 @@ FreezeBurnParalyzeEffect: ; 3f30c (f:730c) ld a, [wEnemyMonType2] cp b ; do target type 2 and move type match? ret z ; return if they match - ld a, [W_PLAYERMOVEEFFECT] + ld a, [wPlayerMoveEffect] cp a, PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance jr c, .next1 ; branch ahead if this is a 10% chance effect.. @@ -7462,7 +7462,7 @@ opponentAttacker: ; 3f382 (f:7382) ld a, [wBattleMonStatus] ; mostly same as above with addresses swapped for opponent and a jp nz, CheckDefrost - ld a, [W_ENEMYMOVETYPE] + ld a, [wEnemyMoveType] ld b, a ld a, [wBattleMonType1] cp b @@ -7470,7 +7470,7 @@ opponentAttacker: ; 3f382 (f:7382) ld a, [wBattleMonType2] cp b ret z - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] cp a, PARALYZE_SIDE_EFFECT1 + 1 ld b, $1a jr c, .next1 @@ -7520,7 +7520,7 @@ CheckDefrost: ; 3f3e2 (f:73e2) and a jr nz, .opponent ;player [attacker] - ld a, [W_PLAYERMOVETYPE] + ld a, [wPlayerMoveType] sub a, FIRE ret nz ; return if type of move used isn't fire ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster] @@ -7533,7 +7533,7 @@ CheckDefrost: ; 3f3e2 (f:73e2) ld hl, FireDefrostedText jr .common .opponent - ld a, [W_ENEMYMOVETYPE] ; same as above with addresses swapped + ld a, [wEnemyMoveType] ; same as above with addresses swapped sub a, FIRE ret nz ld [wBattleMonStatus], a @@ -7553,12 +7553,12 @@ FireDefrostedText: ; 3f423 (f:7423) StatModifierUpEffect: ; 3f428 (f:7428) ld hl, wPlayerMonStatMods - ld de, W_PLAYERMOVEEFFECT + ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] and a jr z, .statModifierUpEffect ld hl, wEnemyMonStatMods - ld de, W_ENEMYMOVEEFFECT + ld de, wEnemyMoveEffect .statModifierUpEffect ld a, [de] sub ATTACK_UP1_EFFECT @@ -7660,14 +7660,14 @@ UpdateStatDone: ; 3f4ca (f:74ca) ld b, c inc b call PrintStatText - ld hl, W_PLAYERBATTSTATUS2 - ld de, W_PLAYERMOVENUM + ld hl, wPlayerBattleStatus2 + ld de, wPlayerMoveNum ld bc, wPlayerMonMinimized ld a, [H_WHOSETURN] and a jr z, .asm_3f4e6 - ld hl, W_ENEMYBATTSTATUS2 - ld de, W_ENEMYMOVENUM + ld hl, wEnemyBattleStatus2 + ld de, wEnemyMoveNum ld bc, wEnemyMonMinimized .asm_3f4e6 ld a, [de] @@ -7721,9 +7721,9 @@ MonsStatsRoseText: ; 3f528 (f:7528) ld hl, GreatlyRoseText ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVEEFFECT] + ld a, [wPlayerMoveEffect] jr z, .asm_3f53b - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] .asm_3f53b cp ATTACK_DOWN1_EFFECT ret nc @@ -7740,14 +7740,14 @@ RoseText: ; 3f547 (f:7547) StatModifierDownEffect: ; 3f54c (f:754c) ld hl, wEnemyMonStatMods - ld de, W_PLAYERMOVEEFFECT - ld bc, W_ENEMYBATTSTATUS1 + ld de, wPlayerMoveEffect + ld bc, wEnemyBattleStatus1 ld a, [H_WHOSETURN] and a jr z, .statModifierDownEffect ld hl, wPlayerMonStatMods - ld de, W_ENEMYMOVEEFFECT - ld bc, W_PLAYERBATTSTATUS1 + ld de, wEnemyMoveEffect + ld bc, wPlayerBattleStatus1 ld a, [wLinkState] cp LINK_STATE_BATTLING jr z, .statModifierDownEffect @@ -7774,7 +7774,7 @@ StatModifierDownEffect: ; 3f54c (f:754c) pop bc pop de pop hl - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jp nz, MoveMissed ld a, [bc] @@ -7923,9 +7923,9 @@ MonsStatsFellText: ; 3f661 (f:7661) ld hl, FellText ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVEEFFECT] + ld a, [wPlayerMoveEffect] jr z, .asm_3f674 - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] .asm_3f674 cp $1a ret c @@ -7983,13 +7983,13 @@ StatModifierRatios: ; 3f6cb (f:76cb) db 4, 1 ; 4.00 BideEffect: ; 3f6e5 (f:76e5) - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 ld de, wPlayerBideAccumulatedDamage ld bc, wPlayerNumAttacksLeft ld a, [H_WHOSETURN] and a jr z, .bideEffect - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 ld de, wEnemyBideAccumulatedDamage ld bc, wEnemyNumAttacksLeft .bideEffect @@ -7998,8 +7998,8 @@ BideEffect: ; 3f6e5 (f:76e5) ld [de], a inc de ld [de], a - ld [W_PLAYERMOVEEFFECT], a - ld [W_ENEMYMOVEEFFECT], a + ld [wPlayerMoveEffect], a + ld [wEnemyMoveEffect], a call BattleRandom and $1 inc a @@ -8010,12 +8010,12 @@ BideEffect: ; 3f6e5 (f:76e5) jp PlayBattleAnimation2 ThrashPetalDanceEffect: ; 3f717 (f:7717) - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 ld de, wPlayerNumAttacksLeft ld a, [H_WHOSETURN] and a jr z, .thrashPetalDanceEffect - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 ld de, wEnemyNumAttacksLeft .thrashPetalDanceEffect set ThrashingAbout, [hl] ; mon is now using thrash/petal dance @@ -8032,10 +8032,10 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) ld a, [H_WHOSETURN] and a jr nz, .asm_3f791 - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a jr nz, .asm_3f77e - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] ld b, a ld a, [wBattleMonLevel] cp b @@ -8053,7 +8053,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) jr nc, .asm_3f76e ld c, 50 call DelayFrames - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] cp TELEPORT jp nz, PrintDidntAffectText jp PrintButItFailedText_ @@ -8063,23 +8063,23 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) ld [wAnimationType], a inc a ld [wEscapedFromBattle], a - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] jr .asm_3f7e4 .asm_3f77e ld c, 50 call DelayFrames ld hl, IsUnaffectedText - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] cp TELEPORT jp nz, PrintText jp PrintButItFailedText_ .asm_3f791 - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a jr nz, .asm_3f7d1 ld a, [wBattleMonLevel] ld b, a - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] cp b jr nc, .asm_3f7c1 add b @@ -8095,7 +8095,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) jr nc, .asm_3f7c1 ld c, 50 call DelayFrames - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] cp TELEPORT jp nz, PrintDidntAffectText jp PrintButItFailedText_ @@ -8105,13 +8105,13 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) ld [wAnimationType], a inc a ld [wEscapedFromBattle], a - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] jr .asm_3f7e4 .asm_3f7d1 ld c, 50 call DelayFrames ld hl, IsUnaffectedText - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] cp TELEPORT jp nz, PrintText jp ConditionalPrintButItFailed @@ -8144,24 +8144,24 @@ WasBlownAwayText: ; 3f80c (f:780c) db "@" TwoToFiveAttacksEffect: ; 3f811 (f:7811) - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 ld de, wPlayerNumAttacksLeft ld bc, wPlayerNumHits ld a, [H_WHOSETURN] and a jr z, .twoToFiveAttacksEffect - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 ld de, wEnemyNumAttacksLeft ld bc, wEnemyNumHits .twoToFiveAttacksEffect bit AttackingMultipleTimes, [hl] ; is mon attacking multiple times? ret nz set AttackingMultipleTimes, [hl] ; mon is now attacking multiple times - ld hl, W_PLAYERMOVEEFFECT + ld hl, wPlayerMoveEffect ld a, [H_WHOSETURN] and a jr z, .setNumberOfHits - ld hl, W_ENEMYMOVEEFFECT + ld hl, wEnemyMoveEffect .setNumberOfHits ld a, [hl] cp TWINEEDLE_EFFECT @@ -8191,13 +8191,13 @@ TwoToFiveAttacksEffect: ; 3f811 (f:7811) FlinchSideEffect: ; 3f85b (f:785b) call CheckTargetSubstitute ret nz - ld hl, W_ENEMYBATTSTATUS1 - ld de, W_PLAYERMOVEEFFECT + ld hl, wEnemyBattleStatus1 + ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] and a jr z, .flinchSideEffect - ld hl, W_PLAYERBATTSTATUS1 - ld de, W_ENEMYMOVEEFFECT + ld hl, wPlayerBattleStatus1 + ld de, wEnemyMoveEffect .flinchSideEffect ld a, [de] cp FLINCH_SIDE_EFFECT1 @@ -8216,14 +8216,14 @@ OneHitKOEffect: ; 3f884 (f:7884) jpab OneHitKOEffect_ ChargeEffect: ; 3f88c (f:788c) - ld hl, W_PLAYERBATTSTATUS1 - ld de, W_PLAYERMOVEEFFECT + ld hl, wPlayerBattleStatus1 + ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] and a ld b, XSTATITEM_ANIM jr z, .chargeEffect - ld hl, W_ENEMYBATTSTATUS1 - ld de, W_ENEMYMOVEEFFECT + ld hl, wEnemyBattleStatus1 + ld de, wEnemyMoveEffect ld b, ANIM_AF .chargeEffect set ChargingUp, [hl] @@ -8298,12 +8298,12 @@ DugAHoleText: ; 3f912 (f:7912) db "@" TrappingEffect: ; 3f917 (f:7917) - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 ld de, wPlayerNumAttacksLeft ld a, [H_WHOSETURN] and a jr z, .trappingEffect - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 ld de, wEnemyNumAttacksLeft .trappingEffect bit UsingTrappingMove, [hl] @@ -8341,20 +8341,20 @@ ConfusionEffect: ; 3f961 (f:7961) call CheckTargetSubstitute jr nz, ConfusionEffectFailed call MoveHitTest - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr nz, ConfusionEffectFailed ConfusionSideEffectSuccess: ; 3f96f (f:796f) ld a, [H_WHOSETURN] and a - ld hl, W_ENEMYBATTSTATUS1 - ld bc, W_ENEMYCONFUSEDCOUNTER - ld a, [W_PLAYERMOVEEFFECT] + ld hl, wEnemyBattleStatus1 + ld bc, wEnemyConfusedCounter + ld a, [wPlayerMoveEffect] jr z, .confuseTarget - ld hl, W_PLAYERBATTSTATUS1 - ld bc, W_PLAYERCONFUSEDCOUNTER - ld a, [W_ENEMYMOVEEFFECT] + ld hl, wPlayerBattleStatus1 + ld bc, wPlayerConfusedCounter + ld a, [wEnemyMoveEffect] .confuseTarget bit Confused, [hl] ; is mon confused? jr nz, ConfusionEffectFailed @@ -8389,33 +8389,33 @@ SubstituteEffect: ; 3f9b9 (f:79b9) jpab SubstituteEffect_ HyperBeamEffect: ; 3f9c1 (f:79c1) - ld hl, W_PLAYERBATTSTATUS2 + ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .hyperBeamEffect - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 .hyperBeamEffect set NeedsToRecharge, [hl] ; mon now needs to recharge ret ClearHyperBeam: ; 3f9cf (f:79cf) push hl - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .asm_3f9db - ld hl, W_PLAYERBATTSTATUS2 + ld hl, wPlayerBattleStatus2 .asm_3f9db res NeedsToRecharge, [hl] ; mon no longer needs to recharge pop hl ret RageEffect: ; 3f9df (f:79df) - ld hl, W_PLAYERBATTSTATUS2 + ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .player - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 .player set UsingRage, [hl] ; mon is now in "rage" mode ret @@ -8424,19 +8424,19 @@ MimicEffect: ; 3f9ed (f:79ed) ld c, 50 call DelayFrames call MoveHitTest - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr nz, .asm_3fa74 ld a, [H_WHOSETURN] and a ld hl, wBattleMonMoves - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] jr nz, .asm_3fa13 ld a, [wLinkState] cp LINK_STATE_BATTLING jr nz, .asm_3fa3a ld hl, wEnemyMonMoves - ld a, [W_ENEMYBATTSTATUS1] + ld a, [wEnemyBattleStatus1] .asm_3fa13 bit Invulnerable, a jr nz, .asm_3fa74 @@ -8461,7 +8461,7 @@ MimicEffect: ; 3f9ed (f:79ed) ld a, [wEnemyMoveListIndex] jr .asm_3fa5f .asm_3fa3a - ld a, [W_ENEMYBATTSTATUS1] + ld a, [wEnemyBattleStatus1] bit Invulnerable, a jr nz, .asm_3fa74 ld a, [wCurrentMenuItem] @@ -8505,15 +8505,15 @@ SplashEffect: ; 3fa84 (f:7a84) DisableEffect: ; 3fa8a (f:7a8a) call MoveHitTest - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr nz, .moveMissed - ld de, W_ENEMYDISABLEDMOVE + ld de, wEnemyDisabledMove ld hl, wEnemyMonMoves ld a, [H_WHOSETURN] and a jr z, .disableEffect - ld de, W_PLAYERDISABLEDMOVE + ld de, wPlayerDisabledMove ld hl, wBattleMonMoves .disableEffect ; no effect if target already has a move disabled @@ -8567,7 +8567,7 @@ DisableEffect: ; 3fa8a (f:7a8a) inc a ; 1-8 turns disabled inc c ; move 1-4 will be disabled swap c - add c ; map disabled move to high nibble of W_ENEMYDISABLEDMOVE / W_PLAYERDISABLEDMOVE + add c ; map disabled move to high nibble of wEnemyDisabledMove / wPlayerDisabledMove ld [de], a call PlayCurrentMoveAnimation2 ld hl, wPlayerDisabledMoveNumber @@ -8655,11 +8655,11 @@ ParalyzedMayNotAttackText: ; 3fb74 (f:7b74) CheckTargetSubstitute: ; 3fb79 (f:7b79) push hl - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .next1 - ld hl, W_PLAYERBATTSTATUS2 + ld hl, wPlayerBattleStatus2 .next1 bit HasSubstituteUp, [hl] pop hl @@ -8670,16 +8670,16 @@ PlayCurrentMoveAnimation2: ; 3fb89 (f:7b89) ; plays wAnimationType 3 or 6 ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] jr z, .notEnemyTurn - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] .notEnemyTurn and a ret z PlayBattleAnimation2: ; 3fb96 (f:7b96) ; play animation ID at a and animation type 6 or 3 - ld [W_ANIMATIONID], a + ld [wAnimationID], a ld a, [H_WHOSETURN] and a ld a, $6 @@ -8696,19 +8696,19 @@ PlayCurrentMoveAnimation: ; 3fba8 (f:7ba8) ld [wAnimationType], a ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] jr z, .notEnemyTurn - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] .notEnemyTurn and a ret z PlayBattleAnimation: ; 3fbb9 (f:7bb9) ; play animation ID at a and predefined animation type - ld [W_ANIMATIONID], a + ld [wAnimationID], a PlayBattleAnimationGotID: ; 3fbbc (f:7bbc) -; play animation at W_ANIMATIONID +; play animation at wAnimationID push hl push de push bc diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm index 7345c5c1..f1a0dd58 100644 --- a/engine/battle/decrement_pp.asm +++ b/engine/battle/decrement_pp.asm @@ -4,9 +4,9 @@ DecrementPP: ; 68000 (1a:4000) cp a, STRUGGLE ret z ; if the pokemon is using "struggle", there's nothing to do ; we don't decrement PP for "struggle" - ld hl, W_PLAYERBATTSTATUS1 - ld a, [hli] ; load the W_PLAYERBATTSTATUS1 pokemon status flags and increment hl to load the - ; W_PLAYERBATTSTATUS2 status flags later + ld hl, wPlayerBattleStatus1 + ld a, [hli] ; load the wPlayerBattleStatus1 pokemon status flags and increment hl to load the + ; wPlayerBattleStatus2 status flags later and a, (1 << StoringEnergy) | (1 << ThrashingAbout) | (1 << AttackingMultipleTimes) ret nz ; if any of these statuses are true, don't decrement PP bit UsingRage, [hl] @@ -17,7 +17,7 @@ DecrementPP: ; 68000 (1a:4000) call .DecrementPP ; decrement PP in the party struct - ld a, [W_PLAYERBATTSTATUS3] + ld a, [wPlayerBattleStatus3] bit Transformed, a ret nz ; Return if transformed. Pokemon Red stores the "current pokemon's" PP ; separately from the "Pokemon in your party's" PP. This is diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index c1387b7b..8cfd30af 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -1,7 +1,7 @@ DrawAllPokeballs: ; 3a849 (e:6849) call LoadPartyPokeballGfx call SetupOwnPartyPokeballs - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a ret z ; return if wild pokémon jp SetupEnemyPartyPokeballs @@ -22,7 +22,7 @@ SetupOwnPartyPokeballs: ; 3a869 (e:6869) ld de, wPartyCount call SetupPokeballs ld a, $60 - ld hl, W_BASECOORDX + ld hl, wBaseCoordX ld [hli], a ld [hl], a ld a, 8 @@ -35,7 +35,7 @@ SetupEnemyPartyPokeballs: ; 3a887 (e:6887) ld hl, wEnemyMons ld de, wEnemyPartyCount call SetupPokeballs - ld hl, W_BASECOORDX + ld hl, wBaseCoordX ld a, $48 ld [hli], a ld [hl], $20 @@ -98,19 +98,19 @@ WritePokeballOAMData: ; 3a8e1 (e:68e1) ld de, wBuffer ld c, PARTY_LENGTH .loop - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] ld [hli], a ld a, [de] ld [hli], a xor a ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] ld b, a ld a, [wHUDPokeballGfxOffsetX] add b - ld [W_BASECOORDX], a + ld [wBaseCoordX], a inc de dec c jr nz, .loop @@ -168,7 +168,7 @@ SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948) ld hl, wPartyMons ld de, wPartyCount call SetupPokeballs - ld hl, W_BASECOORDX + ld hl, wBaseCoordX ld a, $50 ld [hli], a ld [hl], $40 @@ -179,7 +179,7 @@ SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948) ld hl, wEnemyMons ld de, wEnemyPartyCount call SetupPokeballs - ld hl, W_BASECOORDX + ld hl, wBaseCoordX ld a, $50 ld [hli], a ld [hl], $68 diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index f1de313c..34bc3119 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -47,10 +47,10 @@ EndOfBattle: ; 137aa (4:77aa) xor a ld [wLowHealthAlarm], a ;disable low health alarm ld [wChannelSoundIDs + CH4], a - ld [W_ISINBATTLE], a - ld [W_BATTLETYPE], a - ld [W_MOVEMISSED], a - ld [W_CUROPPONENT], a + ld [wIsInBattle], a + ld [wBattleType], a + ld [wMoveMissed], a + ld [wCurOpponent], a ld [wForcePlayerToChooseMon], a ld [wNumRunAttempts], a ld [wEscapedFromBattle], a diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index ab3e3c19..0480bfcb 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -83,7 +83,7 @@ GainExperience: ; 5524f (15:524f) ld a, 1 .next ld [wGainBoostedExp], a - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a ; is it a trainer battle? call nz, BoostExp ; if so, boost exp inc hl @@ -160,11 +160,11 @@ GainExperience: ; 5524f (15:524f) ld a, [hl] ; current level cp d jp z, .nextMon ; if level didn't change, go to next mon - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] push af push hl ld a, d - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld [hl], a ld bc, wPartyMon1Species - wPartyMon1Level add hl, bc @@ -223,7 +223,7 @@ GainExperience: ; 5524f (15:524f) ld bc, 1 + NUM_STATS * 2 ; size of stats call CopyData pop hl - ld a, [W_PLAYERBATTSTATUS3] + ld a, [wPlayerBattleStatus3] bit 3, a ; is the mon transformed? jr nz, .recalcStatChanges ; the mon is not transformed, so update the unmodified stats @@ -261,7 +261,7 @@ GainExperience: ; 5524f (15:524f) predef FlagActionPredef pop hl pop af - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a .nextMon ld a, [wPartyCount] diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index 961f25cf..36492292 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -1,10 +1,10 @@ GetTrainerName_: ; 13a58 (4:7a58) - ld hl, W_GRASSRATE + ld hl, wGrassRate ld a, [wLinkState] and a jr nz, .rival - ld hl, W_RIVALNAME - ld a, [W_TRAINERCLASS] + ld hl, wRivalName + ld a, [wTrainerClass] cp SONY1 jr z, .rival cp SONY2 @@ -19,6 +19,6 @@ GetTrainerName_: ; 13a58 (4:7a58) call GetName ld hl, wcd6d .rival - ld de, W_TRAINERNAME + ld de, wTrainerName ld bc, $d jp CopyData diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index d76f3f41..6702589d 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -55,22 +55,22 @@ CopyMonPicFromBGToSpriteVRAM: ; 7092a (1c:492a) ld bc, 7 * 7 call CopyVideoData ld a, $10 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld a, $70 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld hl, wOAMBuffer lb bc, 6, 6 ld d, $8 .oamLoop push bc - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] ld e, a .oamInnerLoop ld a, e add $8 ld e, a ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] ld [hli], a ld a, d ld [hli], a @@ -80,9 +80,9 @@ CopyMonPicFromBGToSpriteVRAM: ; 7092a (1c:492a) dec c jr nz, .oamInnerLoop inc d - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] add $8 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a pop bc dec b jr nz, .oamLoop diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 5791730c..9372a786 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -27,12 +27,12 @@ InitBattleVariables: ; 525af (14:65af) jr nz, .loop inc a ; POUND ld [wTestBattlePlayerSelectedMove], a - ld a, [W_CURMAP] + ld a, [wCurMap] cp SAFARI_ZONE_EAST jr c, .notSafariBattle cp SAFARI_ZONE_REST_HOUSE_1 jr nc, .notSafariBattle ld a, BATTLE_TYPE_SAFARI - ld [W_BATTLETYPE], a + ld [wBattleType], a .notSafariBattle jpab PlayBattleMusic diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/moveEffects/conversion_effect.asm index e4c5b4bd..8e895361 100644 --- a/engine/battle/moveEffects/conversion_effect.asm +++ b/engine/battle/moveEffects/conversion_effect.asm @@ -3,13 +3,13 @@ ConversionEffect_: ; 139a3 (4:79a3) ld de, wBattleMonType1 ld a, [H_WHOSETURN] and a - ld a, [W_ENEMYBATTSTATUS1] + ld a, [wEnemyBattleStatus1] jr z, .conversionEffect push hl ld h, d ld l, e pop de - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] .conversionEffect bit Invulnerable, a ; is mon immune to typical attacks (dig/fly) jr nz, PrintButItFailedText diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm index 1096794f..ffa75c13 100644 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ b/engine/battle/moveEffects/drain_hp_effect.asm @@ -1,5 +1,5 @@ DrainHPEffect_: ; 783f (1:783f) - ld hl, W_DAMAGE + ld hl, wDamage ld a, [hl] srl a ; divide damage by 2 ld [hli], a @@ -36,12 +36,12 @@ DrainHPEffect_: ; 783f (1:783f) dec bc ld [bc], a ; add damage to attacker's HP and copy new HP to wHPBarNewHP - ld a, [W_DAMAGE + 1] + ld a, [wDamage + 1] ld b, [hl] add b ld [hld], a ld [wHPBarNewHP], a - ld a, [W_DAMAGE] + ld a, [wDamage] ld b, [hl] adc b ld [hli], a @@ -85,9 +85,9 @@ DrainHPEffect_: ; 783f (1:783f) ld hl, SuckedHealthText ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVEEFFECT] + ld a, [wPlayerMoveEffect] jr z, .next3 - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] .next3 cp DREAM_EATER_EFFECT jr nz, .printText diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm index b8a783e4..b1cd03f3 100644 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ b/engine/battle/moveEffects/focus_energy_effect.asm @@ -1,9 +1,9 @@ FocusEnergyEffect_: ; 27f86 (9:7f86) - ld hl, W_PLAYERBATTSTATUS2 + ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .notEnemy - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 .notEnemy bit GettingPumped, [hl] ; is mon already using focus energy? jr nz, .alreadyUsing diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm index 5c5443c0..8c759cce 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/moveEffects/haze_effect.asm @@ -31,14 +31,14 @@ HazeEffect_: ; 139da (4:79da) .cureVolatileStatuses xor a - ld [W_PLAYERDISABLEDMOVE], a - ld [W_ENEMYDISABLEDMOVE], a + ld [wPlayerDisabledMove], a + ld [wEnemyDisabledMove], a ld hl, wPlayerDisabledMoveNumber ld [hli], a ld [hl], a - ld hl, W_PLAYERBATTSTATUS1 + ld hl, wPlayerBattleStatus1 call CureVolatileStatuses - ld hl, W_ENEMYBATTSTATUS1 + ld hl, wEnemyBattleStatus1 call CureVolatileStatuses ld hl, PlayCurrentMoveAnimation call CallBankF diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index cea63a1f..4b8f83bd 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -3,11 +3,11 @@ HealEffect_: ; 3b9ec (e:79ec) and a ld de, wBattleMonHP ld hl, wBattleMonMaxHP - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] jr z, .healEffect ld de, wEnemyMonHP ld hl, wEnemyMonMaxHP - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] .healEffect ld b, a ld a, [de] diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/moveEffects/leech_seed_effect.asm index 1b0afe4b..ea7ceb30 100644 --- a/engine/battle/moveEffects/leech_seed_effect.asm +++ b/engine/battle/moveEffects/leech_seed_effect.asm @@ -1,14 +1,14 @@ LeechSeedEffect_: ; 2bea9 (a:7ea9) callab MoveHitTest - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr nz, .moveMissed - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 ld de, wEnemyMonType1 ld a, [H_WHOSETURN] and a jr z, .leechSeedEffect - ld hl, W_PLAYERBATTSTATUS2 + ld hl, wPlayerBattleStatus2 ld de, wBattleMonType1 .leechSeedEffect ; miss if the target is grass-type or already seeded diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/moveEffects/mist_effect.asm index 1f8e40b0..fcdb4b28 100644 --- a/engine/battle/moveEffects/mist_effect.asm +++ b/engine/battle/moveEffects/mist_effect.asm @@ -1,9 +1,9 @@ MistEffect_: ; 33f2b (c:7f2b) - ld hl, W_PLAYERBATTSTATUS2 + ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .mistEffect - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 .mistEffect bit ProtectedByMist, [hl] ; is mon protected by mist? jr nz, .mistAlreadyInUse diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/moveEffects/one_hit_ko_effect.asm index 907db80c..efba0b79 100644 --- a/engine/battle/moveEffects/one_hit_ko_effect.asm +++ b/engine/battle/moveEffects/one_hit_ko_effect.asm @@ -1,5 +1,5 @@ OneHitKOEffect_: ; 33f57 (c:7f57) - ld hl, W_DAMAGE + ld hl, wDamage xor a ld [hli], a ld [hl], a ; set the damage output to zero @@ -24,7 +24,7 @@ OneHitKOEffect_: ; 33f57 (c:7f57) ld a, [hl] sbc b jr c, .userIsSlower - ld hl, W_DAMAGE + ld hl, wDamage ld a, $ff ld [hli], a ld [hl], a @@ -34,5 +34,5 @@ OneHitKOEffect_: ; 33f57 (c:7f57) .userIsSlower ; keep damage at 0 and set move missed flag if target's current speed is higher instead ld a, $1 - ld [W_MOVEMISSED], a + ld [wMoveMissed], a ret diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm index 658b0c50..eac42a90 100644 --- a/engine/battle/moveEffects/paralyze_effect.asm +++ b/engine/battle/moveEffects/paralyze_effect.asm @@ -1,11 +1,11 @@ ParalyzeEffect_: ; 52601 (14:6601) ld hl, wEnemyMonStatus - ld de, W_PLAYERMOVETYPE + ld de, wPlayerMoveType ld a, [H_WHOSETURN] and a jp z, .next ld hl, wBattleMonStatus - ld de, W_ENEMYMOVETYPE + ld de, wEnemyMoveType .next ld a, [hl] and a ; does the target already have a status ailment? @@ -28,7 +28,7 @@ ParalyzeEffect_: ; 52601 (14:6601) push hl callab MoveHitTest pop hl - ld a, [W_MOVEMISSED] + ld a, [wMoveMissed] and a jr nz, .didntAffect set PAR, [hl] diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 51232af6..43bf8d5f 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -1,16 +1,16 @@ RecoilEffect_: ; 1392c (4:792c) ld a, [H_WHOSETURN] and a - ld a, [W_PLAYERMOVENUM] + ld a, [wPlayerMoveNum] ld hl, wBattleMonMaxHP jr z, .recoilEffect - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] ld hl, wEnemyMonMaxHP .recoilEffect ld d, a - ld a, [W_DAMAGE] + ld a, [wDamage] ld b, a - ld a, [W_DAMAGE + 1] + ld a, [wDamage + 1] ld c, a srl b rr c diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index df34827f..45f785a4 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -1,11 +1,11 @@ ReflectLightScreenEffect_: ; 3bb97 (e:7b97) - ld hl, W_PLAYERBATTSTATUS3 - ld de, W_PLAYERMOVEEFFECT + ld hl, wPlayerBattleStatus3 + ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] and a jr z, .reflectLightScreenEffect - ld hl, W_ENEMYBATTSTATUS3 - ld de, W_ENEMYMOVEEFFECT + ld hl, wEnemyBattleStatus3 + ld de, wEnemyMoveEffect .reflectLightScreenEffect ld a, [de] cp LIGHT_SCREEN_EFFECT diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index c72fffbe..7cac9f62 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -3,13 +3,13 @@ SubstituteEffect_: ; 17dad (5:7dad) call DelayFrames ld hl, wBattleMonMaxHP ld de, wPlayerSubstituteHP - ld bc, W_PLAYERBATTSTATUS2 + ld bc, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .notEnemy ld hl, wEnemyMonMaxHP ld de, wEnemySubstituteHP - ld bc, W_ENEMYBATTSTATUS2 + ld bc, wEnemyBattleStatus2 .notEnemy ld a, [bc] bit HasSubstituteUp, a ; user already has substitute? @@ -44,7 +44,7 @@ SubstituteEffect_: ; 17dad (5:7dad) ld h, b ld l, c set HasSubstituteUp, [hl] - ld a, [W_OPTIONS] + ld a, [wOptions] bit 7, a ; battle animation is enabled? ld hl, PlayCurrentMoveAnimation ld b, BANK(PlayCurrentMoveAnimation) diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm index 6a40eda2..097a0d3a 100644 --- a/engine/battle/moveEffects/transform_effect.asm +++ b/engine/battle/moveEffects/transform_effect.asm @@ -1,27 +1,27 @@ TransformEffect_: ; 3bab1 (e:7ab1) ld hl, wBattleMonSpecies ld de, wEnemyMonSpecies - ld bc, W_ENEMYBATTSTATUS3 - ld a, [W_ENEMYBATTSTATUS1] + ld bc, wEnemyBattleStatus3 + ld a, [wEnemyBattleStatus1] ld a, [H_WHOSETURN] and a jr nz, .hitTest ld hl, wEnemyMonSpecies ld de, wBattleMonSpecies - ld bc, W_PLAYERBATTSTATUS3 + ld bc, wPlayerBattleStatus3 ld [wPlayerMoveListIndex], a - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] .hitTest bit Invulnerable, a ; is mon invulnerable to typical attacks? (fly/dig) jp nz, .failed push hl push de push bc - ld hl, W_PLAYERBATTSTATUS2 + ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .transformEffect - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 .transformEffect ; animation(s) played are different if target has Substitute up bit HasSubstituteUp, [hl] @@ -29,7 +29,7 @@ TransformEffect_: ; 3bab1 (e:7ab1) ld hl, HideSubstituteShowMonAnim ld b, BANK(HideSubstituteShowMonAnim) call nz, Bankswitch - ld a, [W_OPTIONS] + ld a, [wOptions] add a ld hl, PlayCurrentMoveAnimation ld b, BANK(PlayCurrentMoveAnimation) diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm index 38c701a8..deca2426 100644 --- a/engine/battle/print_type.asm +++ b/engine/battle/print_type.asm @@ -6,11 +6,11 @@ PrintMonType: ; 27d6b (9:7d6b) call GetMonHeader pop hl push hl - ld a, [W_MONHTYPE1] + ld a, [wMonHType1] call PrintType - ld a, [W_MONHTYPE1] + ld a, [wMonHType1] ld b, a - ld a, [W_MONHTYPE2] + ld a, [wMonHType2] cp b pop hl jr z, EraseType2Text @@ -34,7 +34,7 @@ EraseType2Text: ; 27d8c (9:7d8c) PrintMoveType: ; 27d98 (9:7d98) call GetPredefRegisters push hl - ld a, [W_PLAYERMOVETYPE] + ld a, [wPlayerMoveType] ; fall through PrintType_: ; 27d9f (9:7d9f) diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 37a45476..4a5657b2 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -15,7 +15,7 @@ ReadTrainer: ; 39c53 (e:5c53) ld [hl],a ; get the pointer to trainer data for this class - ld a,[W_CUROPPONENT] + ld a,[wCurOpponent] sub $C9 ; convert value from pokemon to trainer add a,a ld hl,TrainerDataPointers @@ -25,7 +25,7 @@ ReadTrainer: ; 39c53 (e:5c53) ld a,[hli] ld h,[hl] ld l,a - ld a,[W_TRAINERNO] + ld a,[wTrainerNo] ld b,a ; At this point b contains the trainer number, ; and hl points to the trainer class. @@ -43,13 +43,13 @@ ReadTrainer: ; 39c53 (e:5c53) ; if the first byte of trainer data is FF, ; - each pokemon has a specific level ; (as opposed to the whole team being of the same level) -; - if [W_LONEATTACKNO] != 0, one pokemon on the team has a special move +; - if [wLoneAttackNo] != 0, one pokemon on the team has a special move ; else the first byte is the level of every pokemon on the team .IterateTrainer ld a,[hli] cp $FF ; is the trainer special? jr z,.SpecialTrainer ; if so, check for special moves - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a .LoopTrainerData ld a,[hli] and a ; have we reached the end of the trainer data? @@ -65,11 +65,11 @@ ReadTrainer: ; 39c53 (e:5c53) ; if this code is being run: ; - each pokemon has a specific level ; (as opposed to the whole team being of the same level) -; - if [W_LONEATTACKNO] != 0, one pokemon on the team has a special move +; - if [wLoneAttackNo] != 0, one pokemon on the team has a special move ld a,[hli] and a ; have we reached the end of the trainer data? jr z,.AddLoneMove - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a ld a,[hli] ld [wcf91],a ld a,ENEMY_PARTY_DATA @@ -80,7 +80,7 @@ ReadTrainer: ; 39c53 (e:5c53) jr .SpecialTrainer .AddLoneMove ; does the trainer have a single monster with a different move - ld a,[W_LONEATTACKNO] ; Brock is 01, Misty is 02, Erika is 04, etc + ld a,[wLoneAttackNo] ; Brock is 01, Misty is 02, Erika is 04, etc and a jr z,.AddTeamMove dec a @@ -100,7 +100,7 @@ ReadTrainer: ; 39c53 (e:5c53) ; check if our trainer's team has special moves ; get trainer class number - ld a,[W_CUROPPONENT] + ld a,[wCurOpponent] sub 200 ld b,a ld hl,TeamMoves @@ -130,7 +130,7 @@ ReadTrainer: ; 39c53 (e:5c53) ld [wEnemyMon1Moves + 2],a ; starter - ld a,[W_RIVALSTARTER] + ld a,[wRivalStarter] cp STARTER3 ld b,MEGA_DRAIN jr z,.GiveStarterMove @@ -150,7 +150,7 @@ ReadTrainer: ; 39c53 (e:5c53) ld [de],a inc de ld [de],a - ld a,[W_CURENEMYLVL] + ld a,[wCurEnemyLVL] ld b,a .LastLoop ; update wAmountMoneyWon addresses (money to win) based on enemy's level @@ -162,5 +162,5 @@ ReadTrainer: ; 39c53 (e:5c53) inc de inc de dec b - jr nz,.LastLoop ; repeat W_CURENEMYLVL times + jr nz,.LastLoop ; repeat wCurEnemyLVL times ret diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index 6b0e2220..344e2309 100755 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -18,7 +18,7 @@ PrintSafariZoneBattleText: ; 4277 (1:4277) ld a, [wEnemyMonSpecies] ld [wd0b5], a call GetMonHeader - ld a, [W_MONHCATCHRATE] + ld a, [wMonHCatchRate] ld [wEnemyMonCatchRate], a pop hl .asm_429f diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm index 84ef1f69..ceba63bd 100644 --- a/engine/battle/save_trainer_name.asm +++ b/engine/battle/save_trainer_name.asm @@ -1,6 +1,6 @@ SaveTrainerName: ; 27e4a (9:7e4a) ld hl,TrainerNamePointers - ld a,[W_TRAINERCLASS] + ld a,[wTrainerClass] dec a ld c,a ld b,0 @@ -23,50 +23,50 @@ TrainerNamePointers: ; 27e64 (9:7e64) dw YoungsterName dw BugCatcherName dw LassName - dw W_TRAINERNAME + dw wTrainerName dw JrTrainerMName dw JrTrainerFName dw PokemaniacName dw SuperNerdName - dw W_TRAINERNAME - dw W_TRAINERNAME + dw wTrainerName + dw wTrainerName dw BurglarName dw EngineerName dw JugglerXName - dw W_TRAINERNAME + dw wTrainerName dw SwimmerName - dw W_TRAINERNAME - dw W_TRAINERNAME + dw wTrainerName + dw wTrainerName dw BeautyName - dw W_TRAINERNAME + dw wTrainerName dw RockerName dw JugglerName - dw W_TRAINERNAME - dw W_TRAINERNAME + dw wTrainerName + dw wTrainerName dw BlackbeltName - dw W_TRAINERNAME + dw wTrainerName dw ProfOakName dw ChiefName dw ScientistName - dw W_TRAINERNAME + dw wTrainerName dw RocketName dw CooltrainerMName dw CooltrainerFName - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME - dw W_TRAINERNAME + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName YoungsterName: ; 27ec2 (9:7ec2) db "YOUNGSTER@" diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index afb04216..40a115b9 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -7,7 +7,7 @@ AIEnemyTrainerChooseMoves: ; 39719 (e:5719) ld [hli], a ; move 2 ld [hli], a ; move 3 ld [hl], a ; move 4 - ld a, [W_ENEMYDISABLEDMOVE] ; forbid disabled move (if any) + ld a, [wEnemyDisabledMove] ; forbid disabled move (if any) swap a and $f jr z, .noMoveDisabled @@ -19,7 +19,7 @@ AIEnemyTrainerChooseMoves: ; 39719 (e:5719) ld [hl], $50 ; forbid (highly discourage) disabled move .noMoveDisabled ld hl, TrainerClassMoveChoiceModifications - ld a, [W_TRAINERCLASS] + ld a, [wTrainerClass] ld b, a .loopTrainerClasses dec b @@ -126,10 +126,10 @@ AIMoveChoiceModification1: ; 397ab (e:57ab) ret z ; no more moves in move set inc de call ReadMove - ld a, [W_ENEMYMOVEPOWER] + ld a, [wEnemyMovePower] and a jr nz, .nextMove - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] push hl push de push bc @@ -171,7 +171,7 @@ AIMoveChoiceModification2: ; 397e7 (e:57e7) ret z ; no more moves in move set inc de call ReadMove - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] cp ATTACK_UP1_EFFECT jr c, .nextMove cp BIDE_EFFECT @@ -218,7 +218,7 @@ AIMoveChoiceModification3: ; 39817 (e:5817) push hl push de push bc - ld a, [W_ENEMYMOVETYPE] + ld a, [wEnemyMoveType] ld d, a ld hl, wEnemyMonMoves ; enemy moves ld b, NUM_MOVES + 1 @@ -230,17 +230,17 @@ AIMoveChoiceModification3: ; 39817 (e:5817) and a jr z, .done call ReadMove - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] cp SUPER_FANG_EFFECT jr z, .betterMoveFound ; Super Fang is considered to be a better move cp SPECIAL_DAMAGE_EFFECT jr z, .betterMoveFound ; any special damage moves are considered to be better moves cp FLY_EFFECT jr z, .betterMoveFound ; Fly is considered to be a better move - ld a, [W_ENEMYMOVETYPE] + ld a, [wEnemyMoveType] cp d jr z, .loopMoves - ld a, [W_ENEMYMOVEPOWER] + ld a, [wEnemyMovePower] and a jr nz, .betterMoveFound ; damaging moves of a different type are considered to be better moves jr .loopMoves @@ -266,7 +266,7 @@ ReadMove: ; 39884 (e:5884) ld hl,Moves ld bc,MoveEnd - Moves call AddNTimes - ld de,W_ENEMYMOVENUM + ld de,wEnemyMoveNum call CopyData pop bc pop de @@ -338,13 +338,13 @@ INCLUDE "data/trainer_parties.asm" TrainerAI: ; 3a52e (e:652e) and a - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] dec a ret z ; if not a trainer, we're done here ld a,[wLinkState] cp LINK_STATE_BATTLING ret z - ld a,[W_TRAINERCLASS] ; what trainer class is this? + ld a,[wTrainerClass] ; what trainer class is this? dec a ld c,a ld b,0 @@ -727,27 +727,27 @@ AICureStatus: ; 3a791 (e:6791) xor a ld [hl],a ; clear status in enemy team roster ld [wEnemyMonStatus],a ; clear status of active enemy - ld hl,W_ENEMYBATTSTATUS3 + ld hl,wEnemyBattleStatus3 res 0,[hl] ret AIUseXAccuracy: ; 0x3a7a8 unused call AIPlayRestoringSFX - ld hl,W_ENEMYBATTSTATUS2 + ld hl,wEnemyBattleStatus2 set 0,[hl] ld a,X_ACCURACY jp AIPrintItemUse AIUseGuardSpec: ; 3a7b5 (e:67b5) call AIPlayRestoringSFX - ld hl,W_ENEMYBATTSTATUS2 + ld hl,wEnemyBattleStatus2 set 1,[hl] ld a,GUARD_SPEC_ jp AIPrintItemUse AIUseDireHit: ; 0x3a7c2 unused call AIPlayRestoringSFX - ld hl,W_ENEMYBATTSTATUS2 + ld hl,wEnemyBattleStatus2 set 2,[hl] ld a,DIRE_HIT jp AIPrintItemUse @@ -803,7 +803,7 @@ AIIncreaseStat: ; 3a808 (e:6808) push bc call AIPrintItemUse_ pop bc - ld hl,W_ENEMYMOVEEFFECT + ld hl,wEnemyMoveEffect ld a,[hld] push af ld a,[hl] diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 144234bb..5e553129 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -27,9 +27,9 @@ TryDoWildEncounter: ; 13870 (4:7870) ; is the bottom right tile (9,9) of the half-block we're standing in a grass/water tile? coord hl, 9, 9 ld c, [hl] - ld a, [W_GRASSTILE] + ld a, [wGrassTile] cp c - ld a, [W_GRASSRATE] + ld a, [wGrassRate] jr z, .CanEncounter ld a, $14 ; in all tilesets with a water tile, this is its id cp c @@ -38,13 +38,13 @@ TryDoWildEncounter: ; 13870 (4:7870) ; even if not in grass/water, standing anywhere we can encounter pokemon ; so long as the map is "indoor" and has wild pokemon defined. ; ...as long as it's not Viridian Forest or Safari Zone. - ld a, [W_CURMAP] + ld a, [wCurMap] cp REDS_HOUSE_1F ; is this an indoor map? jr c, .CantEncounter2 - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp FOREST ; Viridian Forest/Safari Zone jr z, .CantEncounter2 - ld a, [W_GRASSRATE] + ld a, [wGrassRate] .CanEncounter ; compare encounter chance with a random number to determine if there will be an encounter ld b, a @@ -63,7 +63,7 @@ TryDoWildEncounter: ; 13870 (4:7870) .gotEncounterSlot ; determine which wild pokemon (grass or water) can appear in the half-block we're standing in ld c, [hl] - ld hl, W_GRASSMONS + ld hl, wGrassMons aCoord 8, 9 cp $14 ; is the bottom left tile (8,9) of the half-block we're standing in a water tile? jr nz, .gotWildEncounterType ; else, it's treated as a grass tile by default @@ -74,7 +74,7 @@ TryDoWildEncounter: ; 13870 (4:7870) ld b, 0 add hl, bc ld a, [hli] - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, [hl] ld [wcf91], a ld [wEnemyMonSpecies2], a @@ -83,7 +83,7 @@ TryDoWildEncounter: ; 13870 (4:7870) jr z, .willEncounter ld a, [wPartyMon1Level] ld b, a - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] cp b jr c, .CantEncounter2 ; repel prevents encounters if the leading party mon's level is higher than the wild mon jr .willEncounter diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 465561ca..f2f881d8 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -57,8 +57,8 @@ CableClub_DoBattleOrTradeAgain: ; 5345 ld [hli], a dec b jr nz, .zeroPlayerDataPatchListLoop - ld hl, W_GRASSRATE - ld bc, W_TRAINERHEADERPTR - W_GRASSRATE + ld hl, wGrassRate + ld bc, wTrainerHeaderPtr - wGrassRate .zeroEnemyPartyLoop xor a ld [hli], a @@ -186,7 +186,7 @@ CableClub_DoBattleOrTradeAgain: ; 5345 dec c jr nz, .copyEnemyNameLoop ld de, wEnemyPartyCount - ld bc, W_TRAINERHEADERPTR - wEnemyPartyCount + ld bc, wTrainerHeaderPtr - wEnemyPartyCount .copyEnemyPartyLoop ld a, [hli] cp SERIAL_NO_DATA_BYTE @@ -275,10 +275,10 @@ CableClub_DoBattleOrTradeAgain: ; 5345 ld a, LINK_STATE_BATTLING ld [wLinkState], a ld a, OPP_SONY1 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a call ClearScreen call Delay3 - ld hl, W_OPTIONS + ld hl, wOptions res 7, [hl] predef InitOpponent predef HealParty @@ -900,18 +900,18 @@ CableClub_Run: ; 5a5f (1:5a5f) call CableClub_DoBattleOrTrade ld hl, Club_GFX ld a, h - ld [W_TILESETGFXPTR + 1], a + ld [wTileSetGFXPtr + 1], a ld a, l - ld [W_TILESETGFXPTR], a + ld [wTileSetGFXPtr], a ld a, Bank(Club_GFX) - ld [W_TILESETBANK], a + ld [wTileSetBank], a ld hl, Club_Coll ld a, h - ld [W_TILESETCOLLISIONPTR + 1], a + ld [wTileSetCollisionPtr + 1], a ld a, l - ld [W_TILESETCOLLISIONPTR], a + ld [wTileSetCollisionPtr], a xor a - ld [W_GRASSRATE], a + ld [wGrassRate], a inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a ld [$ffb5], a diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 056c125e..2113e50a 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -105,7 +105,7 @@ Evolution_PartyMonLoop: ; loop over party mons cp b ; is the mon's level greater than the evolution requirement? jp c, .nextEvoEntry2 ; if so, go the next evolution entry .doEvolution - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, 1 ld [wEvolutionOccurred], a push hl @@ -163,10 +163,10 @@ Evolution_PartyMonLoop: ; loop over party mons ld hl, BaseStats ld bc, MonBaseStatsEnd - MonBaseStats call AddNTimes - ld de, W_MONHEADER + ld de, wMonHeader call CopyData ld a, [wd0b5] - ld [W_MONHINDEX], a + ld [wMonHIndex], a pop af ld [wd11e], a ld hl, wLoadedMonHPExp - 1 @@ -210,7 +210,7 @@ Evolution_PartyMonLoop: ; loop over party mons call LearnMoveFromLevelUp pop hl predef SetPartyMonTypes - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a call z, Evolution_ReloadTilesetTilePatterns predef IndexToPokedex @@ -249,7 +249,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wLinkState] cp LINK_STATE_TRADING ret z - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a ret nz ld a, [wEvolutionOccurred] @@ -262,7 +262,7 @@ RenameEvolvedMon: ; 3aef7 (e:6ef7) ; nickname, in which case the nickname is kept. ld a, [wd0b5] push af - ld a, [W_MONHINDEX] + ld a, [wMonHIndex] ld [wd0b5], a call GetName pop af @@ -340,7 +340,7 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b) and a ; have we reached the end of the learn set? jr z, .done ; if we've reached the end of the learn set, jump ld b, a ; level the move is learnt at - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] cp b ; is the move learnt at the mon's current level? ld a, [hli] ; move ID jr nz, .learnSetLoop @@ -375,7 +375,7 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b) ld [wd11e], a ret -; writes the moves a mon has at level [W_CURENEMYLVL] to [de] +; writes the moves a mon has at level [wCurEnemyLVL] to [de] ; move slots are being filled up sequentially and shifted if all slots are full WriteMonMoves: ; 3afb8 (e:6fb8) call GetPredefRegisters @@ -407,7 +407,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8) and a jp z, .done ; end of list ld b, a - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] cp b jp c, .done ; mon level < move level (assumption: learnset is sorted by level) ld a, [wLearningMovesFromDayCare] diff --git a/engine/experience.asm b/engine/experience.asm index b43fbcf9..e1037950 100755 --- a/engine/experience.asm +++ b/engine/experience.asm @@ -29,7 +29,7 @@ CalcLevelFromExperience: ; 58f43 (16:4f43) ; calculates the amount of experience needed for level d CalcExperience: ; 58f6a (16:4f6a) - ld a, [W_MONHGROWTHRATE] + ld a, [wMonHGrowthRate] add a add a ld c, a diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 02e2b743..33e7b426 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -7,12 +7,12 @@ _GivePokemon: ; 4fda5 (13:7da5) ld a, [wPartyCount] cp PARTY_LENGTH jr c, .addToParty - ld a, [W_NUMINBOX] + ld a, [wNumInBox] cp MONS_PER_BOX jr nc, .boxFull ; add to box xor a - ld [W_ENEMYBATTSTATUS3], a + ld [wEnemyBattleStatus3], a ld a, [wcf91] ld [wEnemyMonSpecies2], a callab LoadEnemyMonData diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index d95c01c5..75cbeb2c 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -20,7 +20,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) xor a ld [wUpdateSpritesEnabled], a ld [hTilesetType], a - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a ld [wLetterPrintingDelayFlags], a ; no delay ld [wHoFMonOrPlayer], a ; mon inc a @@ -224,12 +224,12 @@ HoFDisplayPlayerStats: ; 70377 (1c:4377) ld de, HoFPlayTimeText call PlaceString coord hl, 5, 7 - ld de, W_PLAYTIMEHOURS + 1 + ld de, wPlayTimeHours + 1 lb bc, 1, 3 call PrintNumber ld [hl], $6d inc hl - ld de, W_PLAYTIMEMINUTES + 1 + ld de, wPlayTimeMinutes + 1 lb bc, LEADING_ZEROES | 1, 2 call PrintNumber coord hl, 1, 9 diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index 0a93fd44..ab66a818 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -7,7 +7,7 @@ GymStatues: ; 62419 (18:6419) cp SPRITE_FACING_UP ret nz ld hl, .BadgeFlags - ld a, [W_CURMAP] + ld a, [wCurMap] ld b, a .loop ld a, [hli] @@ -50,7 +50,7 @@ GymStatueText2: ; 62458 (18:6458) PrintBenchGuyText: ; 6245d (18:645d) call EnableAutoTextBoxDrawing ld hl, BenchGuyTextPointers - ld a, [W_CURMAP] + ld a, [wCurMap] ld b, a .loop ld a, [hli] diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index 80251b94..d6e25cec 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -4,7 +4,7 @@ PrintBookshelfText: ; fb50 (3:7b50) cp SPRITE_FACING_UP jr nz, .noMatch ; facing up - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] ld b, a aCoord 8, 7 ld c, a @@ -78,7 +78,7 @@ IndigoPlateauStatues: ; fbbf (3:7bbf) TX_ASM ld hl, IndigoPlateauStatuesText1 call PrintText - ld a, [W_XCOORD] + ld a, [wXCoord] bit 0, a ld hl, IndigoPlateauStatuesText2 jr nz, .asm_fbd3 @@ -102,7 +102,7 @@ IndigoPlateauStatuesText3: ; fbe3 (3:7be3) BookOrSculptureText: ; fbe8 (3:7be8) TX_ASM ld hl, PokemonBooksText - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp MANSION ; Celadon Mansion tileset jr nz, .asm_fbfd aCoord 8, 6 diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 0c1e2be2..f123e89b 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -38,7 +38,7 @@ StrengthsAndWeaknessesText: ; 1e983 (7:6983) SafariZoneCheck: ; 1e988 (7:6988) CheckEventHL EVENT_IN_SAFARI_ZONE ; if we are not in the Safari Zone, jr z, SafariZoneGameStillGoing ; don't bother printing game over text - ld a, [W_NUMSAFARIBALLS] + ld a, [wNumSafariBalls] and a jr z, SafariZoneGameOver jr SafariZoneGameStillGoing @@ -83,7 +83,7 @@ SafariZoneGameOver: ; 1e9b0 (7:69b0) ld a, $3 ld [wDestinationWarpID], a ld a, $5 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a SetEvent EVENT_SAFARI_GAME_OVER ld a, 1 ld [wSafariZoneGameOver], a @@ -97,7 +97,7 @@ PrintSafariGameOverText: ; 1e9ed (7:69ed) SafariGameOverText: ; 1e9f7 (7:69f7) TX_ASM - ld a, [W_NUMSAFARIBALLS] + ld a, [wNumSafariBalls] and a jr z, .asm_1ea04 ld hl, TimesUpText diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index 4229afd8..176d6af7 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -108,7 +108,7 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) ld bc, wPartyMon2 - wPartyMon1 call AddNTimes ld a,[hl] - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a ld hl,wCompletedInGameTradeFlags ld a,[wWhichTrade] ld c,a @@ -118,13 +118,13 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) call PrintText ld a,[wWhichPokemon] push af - ld a,[W_CURENEMYLVL] + ld a,[wCurEnemyLVL] push af call LoadHpBarAndStatusTilePatterns call InGameTrade_PrepareTradeData predef InternalClockTradeAnim pop af - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a pop af ld [wWhichPokemon],a ld a,[wInGameTradeReceiveMonSpecies] diff --git a/engine/intro.asm b/engine/intro.asm index 29aa4ef4..e0c8242c 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -29,9 +29,9 @@ PlayIntroScene: ; 4169d (10:569d) ld b, $3 ; Gengar tiles call IntroCopyTiles ld a, 0 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld a, 80 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a lb bc, 6, 6 call InitIntroNidorinoOAM lb de, 80 / 2, MOVE_NIDORINO_RIGHT @@ -141,10 +141,10 @@ AnimateIntroNidorino: ; 41793 (10:5793) ld a, [de] cp $50 ret z - ld [W_BASECOORDY], a + ld [wBaseCoordY], a inc de ld a, [de] - ld [W_BASECOORDX], a + ld [wBaseCoordX], a push de ld c, 6 * 6 call UpdateIntroNidorinoOAM @@ -159,10 +159,10 @@ UpdateIntroNidorinoOAM: ; 417ae (10:57ae) ld a, [wIntroNidorinoBaseTile] ld d, a .loop - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] add [hl] ld [hli], a ; Y - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] add [hl] ld [hli], a ; X ld a, d @@ -178,14 +178,14 @@ InitIntroNidorinoOAM: ; 417c7 (10:57c7) ld d, 0 .loop push bc - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] ld e, a .innerLoop ld a, e add 8 ld e, a ld [hli], a ; Y - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] ld [hli], a ; X ld a, d ld [hli], a ; tile @@ -194,9 +194,9 @@ InitIntroNidorinoOAM: ; 417c7 (10:57c7) inc d dec c jr nz, .innerLoop - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] add 8 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a pop bc dec b jr nz, .loop @@ -245,9 +245,9 @@ IntroMoveMon: ; 4180e (10:580e) .moveNidorinoRight push de ld a, 2 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a xor a - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld c, 6 * 6 call UpdateIntroNidorinoOAM pop de @@ -312,7 +312,7 @@ PlayShootingStar: ; 4188a (10:588a) call ClearScreen call DisableLCD xor a - ld [W_CUROPPONENT], a + ld [wCurOpponent], a call IntroDrawBlackBars call LoadIntroGraphics call EnableLCD diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index 5da72388..d638b0b8 100755 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm @@ -3,7 +3,7 @@ HiddenItemNear: ; 7481f (1d:481f) ld b, 0 .loop ld de, 3 - ld a, [W_CURMAP] + ld a, [wCurMap] call IsInRestOfArray ret nc ; return if current map has no hidden items push bc @@ -24,19 +24,19 @@ HiddenItemNear: ; 7481f (1d:481f) inc hl jr nz, .loop ; if the item has already been obtained ; check if the item is within 4-5 tiles (depending on the direction of item) - ld a, [W_YCOORD] + ld a, [wYCoord] call Sub5ClampTo0 cp d jr nc, .loop - ld a, [W_YCOORD] + ld a, [wYCoord] add 4 cp d jr c, .loop - ld a, [W_XCOORD] + ld a, [wXCoord] call Sub5ClampTo0 cp e jr nc, .loop - ld a, [W_XCOORD] + ld a, [wXCoord] add 5 cp e jr c, .loop diff --git a/engine/items/items.asm b/engine/items/items.asm index 1d2001f0..9e022ae8 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -103,7 +103,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1) ItemUseBall: ; d687 (3:5687) ; Balls can't be used out of battle. - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp z,ItemUseNotTime @@ -112,14 +112,14 @@ ItemUseBall: ; d687 (3:5687) jp nz,ThrowBallAtTrainerMon ; If this is for the old man battle, skip checking if the party & box are full. - ld a,[W_BATTLETYPE] + ld a,[wBattleType] dec a jr z,.canUseBall ld a,[wPartyCount] ; is party full? cp a,PARTY_LENGTH jr nz,.canUseBall - ld a,[W_NUMINBOX] ; is box full? + ld a,[wNumInBox] ; is box full? cp a,MONS_PER_BOX jp z,BoxFullCannotThrowBall @@ -127,12 +127,12 @@ ItemUseBall: ; d687 (3:5687) xor a ld [wCapturedMonSpecies],a - ld a,[W_BATTLETYPE] + ld a,[wBattleType] cp a,BATTLE_TYPE_SAFARI jr nz,.skipSafariZoneCode .safariZone - ld hl,W_NUMSAFARIBALLS + ld hl,wNumSafariBalls dec [hl] ; remove a Safari Ball .skipSafariZoneCode @@ -151,12 +151,12 @@ ItemUseBall: ; d687 (3:5687) ld b,$10 ; can't be caught value jp z,.setAnimData - ld a,[W_BATTLETYPE] + ld a,[wBattleType] dec a jr nz,.notOldManBattle .oldManBattle - ld hl,W_GRASSRATE + ld hl,wGrassRate ld de,wPlayerName ld bc,NAME_LENGTH call CopyData ; save the player's name in the Wild Monster data (part of the Cinnabar Island Missingno. glitch) @@ -165,7 +165,7 @@ ItemUseBall: ; d687 (3:5687) .notOldManBattle ; If the player is fighting the ghost Marowak, set the value that indicates the ; Pokémon can't be caught and skip the capture calculations. - ld a,[W_CURMAP] + ld a,[wCurMap] cp a,POKEMONTOWER_6 jr nz,.loop ld a,[wEnemyMonSpecies2] @@ -420,7 +420,7 @@ ItemUseBall: ; d687 (3:5687) ; Do the animation. ld a,TOSS_ANIM - ld [W_ANIMATIONID],a + ld [wAnimationID],a xor a ld [H_WHOSETURN],a ld [wAnimationType],a @@ -470,7 +470,7 @@ ItemUseBall: ; d687 (3:5687) ; If the Pokémon is transformed, the Pokémon is assumed to be a Ditto. ; This is a bug because a wild Pokémon could have used Transform via ; Mirror Move even though the only wild Pokémon that knows Transform is Ditto. - ld hl,W_ENEMYBATTSTATUS3 + ld hl,wEnemyBattleStatus3 bit Transformed,[hl] jr z,.notTransformed ld a,DITTO @@ -494,7 +494,7 @@ ItemUseBall: ; d687 (3:5687) ld a,[wEnemyMonSpecies2] ld [wcf91],a ld a,[wEnemyMonLevel] - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a callab LoadEnemyMonData pop af ld [wcf91],a @@ -510,7 +510,7 @@ ItemUseBall: ; d687 (3:5687) ld [wCapturedMonSpecies],a ld [wcf91],a ld [wd11e],a - ld a,[W_BATTLETYPE] + ld a,[wBattleType] dec a ; is this the old man battle? jr z,.oldManCaughtMon ; if so, don't give the player the caught Pokémon @@ -573,7 +573,7 @@ ItemUseBall: ; d687 (3:5687) call ClearSprites .done - ld a,[W_BATTLETYPE] + ld a,[wBattleType] and a ; is this the old man battle? ret nz ; if so, don't remove a ball from the bag @@ -627,13 +627,13 @@ ItemUseBallText06: ; d961 (3:5961) db "@" ItemUseTownMap: ; d968 (3:5968) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,ItemUseNotTime jpba DisplayTownMap ItemUseBicycle: ; d977 (3:5977) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,ItemUseNotTime ld a,[wWalkBikeSurfState] @@ -695,7 +695,7 @@ ItemUseSurfboard: ; d9b4 (3:59b4) ld hl,TilePairCollisionsWater call CheckForTilePairCollisions jr c,.cannotStopSurfing - ld hl,W_TILESETCOLLISIONPTR ; pointer to list of passable tiles + ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles ld a,[hli] ld h,[hl] ld l,a ; hl now points to passable tiles @@ -754,7 +754,7 @@ ItemUsePokedex: ; da56 (3:5a56) predef_jump ShowPokedexMenu ItemUseEvoStone: ; da5b (3:5a5b) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,ItemUseNotTime ld a,[wWhichPokemon] @@ -795,7 +795,7 @@ ItemUseEvoStone: ; da5b (3:5a5b) ret ItemUseVitamin: ; dab4 (3:5ab4) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,ItemUseNotTime @@ -898,7 +898,7 @@ ItemUseMedicine: ; dabb (3:5abb) xor a ld [wBattleMonStatus],a ; remove the status ailment in the in-battle pokemon data push hl - ld hl,W_PLAYERBATTSTATUS3 + ld hl,wPlayerBattleStatus3 res BadlyPoisoned,[hl] ; heal Toxic status pop hl ld bc,wPartyMon1Stats - wPartyMon1Status @@ -926,7 +926,7 @@ ItemUseMedicine: ; dabb (3:5abb) jr z,.updateInBattleFaintedData jp .healingItemNoEffect .updateInBattleFaintedData - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jr z,.compareCurrentHPToMaxHP push hl @@ -1244,7 +1244,7 @@ ItemUseMedicine: ; dabb (3:5abb) ret nz ; if so, return call GBPalWhiteOut call z,RunDefaultPaletteCommand - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a ret nz jp ReloadMapData @@ -1256,7 +1256,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld bc,wPartyMon1Level - wPartyMon1 add hl,bc ; hl now points to level ld a,[hl] ; a = level - ld [W_CURENEMYLVL],a ; store level + ld [wCurEnemyLVL],a ; store level call GetMonHeader push de ld a,d @@ -1335,7 +1335,7 @@ ItemUseMedicine: ; dabb (3:5abb) jr z,.vitaminNoEffect ; can't raise level above 100 inc a ld [hl],a ; store incremented level - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a push hl push de ld d,a @@ -1454,7 +1454,7 @@ ItemUseRock: ; df67 (3:5f67) ld de,wSafariBaitFactor ; bait factor BaitRockCommon: ; df7f (3:5f7f) - ld [W_ANIMATIONID],a + ld [wAnimationID],a xor a ld [wAnimationType],a ld [H_WHOSETURN],a @@ -1486,13 +1486,13 @@ ThrewRockText: ; dfaa (3:5faa) ; also used for Dig out-of-battle effect ItemUseEscapeRope: ; dfaf (3:5faf) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jr nz,.notUsable - ld a,[W_CURMAP] + ld a,[wCurMap] cp a,AGATHAS_ROOM jr z,.notUsable - ld a,[W_CURMAPTILESET] + ld a,[wCurMapTileset] ld b,a ld hl,EscapeRopeTilesets .loop @@ -1508,8 +1508,8 @@ ItemUseEscapeRope: ; dfaf (3:5faf) res 4,[hl] ResetEvent EVENT_IN_SAFARI_ZONE xor a - ld [W_NUMSAFARIBALLS],a - ld [W_SAFARIZONEENTRANCECURSCRIPT],a + ld [wNumSafariBalls],a + ld [wSafariZoneEntranceCurScript],a inc a ld [wEscapedFromBattle],a ld [wActionResultOrTookBattleTurn],a ; item used @@ -1531,7 +1531,7 @@ ItemUseRepel: ; e003 (3:6003) ld b,100 ItemUseRepelCommon: ; e005 (3:6005) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,ItemUseNotTime ld a,b @@ -1540,10 +1540,10 @@ ItemUseRepelCommon: ; e005 (3:6005) ; handles X Accuracy item ItemUseXAccuracy: ; e013 (3:6013) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp z,ItemUseNotTime - ld hl,W_PLAYERBATTSTATUS2 + ld hl,wPlayerBattleStatus2 set UsingXAccuracy,[hl] ; X Accuracy bit jp PrintItemUseTextAndRemoveItem @@ -1568,7 +1568,7 @@ ItemUseCardKey: ; e022 (3:6022) jp nz,ItemUseNotTime ld hl,CardKeyTable3 .next1 - ld a,[W_CURMAP] + ld a,[wCurMap] ld b,a .loop ld a,[hli] @@ -1641,7 +1641,7 @@ CardKeyTable3: ; e0c4 (3:60c4) db $ff ItemUsePokedoll: ; e0cd (3:60cd) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] dec a jp nz,ItemUseNotTime ld a,$01 @@ -1649,10 +1649,10 @@ ItemUsePokedoll: ; e0cd (3:60cd) jp PrintItemUseTextAndRemoveItem ItemUseGuardSpec: ; e0dc (3:60dc) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp z,ItemUseNotTime - ld hl,W_PLAYERBATTSTATUS2 + ld hl,wPlayerBattleStatus2 set ProtectedByMist,[hl] ; Mist bit jp PrintItemUseTextAndRemoveItem @@ -1665,15 +1665,15 @@ ItemUseMaxRepel: ; e0f0 (3:60f0) jp ItemUseRepelCommon ItemUseDireHit: ; e0f5 (3:60f5) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp z,ItemUseNotTime - ld hl,W_PLAYERBATTSTATUS2 + ld hl,wPlayerBattleStatus2 set GettingPumped,[hl] ; Focus Energy bit jp PrintItemUseTextAndRemoveItem ItemUseXStat: ; e104 (3:6104) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jr nz,.inBattle call ItemUseNotTime @@ -1681,18 +1681,18 @@ ItemUseXStat: ; e104 (3:6104) ld [wActionResultOrTookBattleTurn],a ; item not used ret .inBattle - ld hl,W_PLAYERMOVENUM + ld hl,wPlayerMoveNum ld a,[hli] - push af ; save [W_PLAYERMOVENUM] + push af ; save [wPlayerMoveNum] ld a,[hl] - push af ; save [W_PLAYERMOVEEFFECT] + push af ; save [wPlayerMoveEffect] push hl ld a,[wcf91] sub a,X_ATTACK - ATTACK_UP1_EFFECT ld [hl],a ; store player move effect call PrintItemUseTextAndRemoveItem ld a,XSTATITEM_ANIM ; X stat item animation ID - ld [W_PLAYERMOVENUM],a + ld [wPlayerMoveNum],a call LoadScreenTilesFromBuffer1 ; restore saved screen call Delay3 xor a @@ -1700,18 +1700,18 @@ ItemUseXStat: ; e104 (3:6104) callba StatModifierUpEffect ; do stat increase move pop hl pop af - ld [hld],a ; restore [W_PLAYERMOVEEFFECT] + ld [hld],a ; restore [wPlayerMoveEffect] pop af - ld [hl],a ; restore [W_PLAYERMOVENUM] + ld [hl],a ; restore [wPlayerMoveNum] ret ItemUsePokeflute: ; e140 (3:6140) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jr nz,.inBattle ; if not in battle call ItemUseReloadOverworldData - ld a,[W_CURMAP] + ld a,[wCurMap] cp a,ROUTE_12 jr nz,.notRoute12 CheckEvent EVENT_BEAT_ROUTE12_SNORLAX @@ -1746,7 +1746,7 @@ ItemUsePokeflute: ; e140 (3:6140) ld b,~SLP & $ff ld hl,wPartyMon1Status call WakeUpEntireParty - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] dec a ; is it a trainer battle? jr z,.skipWakingUpEnemyParty ; if it's a trainer battle @@ -1838,7 +1838,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215) TX_FAR _PlayedFluteHadEffectText db $06 TX_ASM - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jr nz,.done ; play out-of-battle pokeflute music @@ -1856,7 +1856,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215) jp TextScriptEnd ; end text ItemUseCoinCase: ; e23a (3:623a) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,ItemUseNotTime ld hl,CoinCaseNumCoinsText @@ -1913,11 +1913,11 @@ RodResponse: ; e28d (3:628d) jr nz, .next ; if yes, store level and species data ld a, 1 - ld [W_MOVEMISSED], a + ld [wMoveMissed], a ld a, b ; level - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, c ; species - ld [W_CUROPPONENT], a + ld [wCurOpponent], a .next ld hl, wWalkBikeSurfState @@ -1934,7 +1934,7 @@ RodResponse: ; e28d (3:628d) ; checks if fishing is possible and if so, runs initialization code common to all rods ; unsets carry if fishing is possible, sets carry if not FishingInit: ; e2b4 (3:62b4) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jr z,.notInBattle scf ; can't fish during battle @@ -1962,7 +1962,7 @@ ItemUseOaksParcel: ; e2de (3:62de) jp ItemUseNotYoursToUse ItemUseItemfinder: ; e2e1 (3:62e1) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,ItemUseNotTime call ItemUseReloadOverworldData @@ -1990,7 +1990,7 @@ ItemfinderFoundNothingText: ; e312 (3:6312) db "@" ItemUsePPUp: ; e317 (3:6317) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,ItemUseNotTime @@ -2195,7 +2195,7 @@ UnusableItem: ; e476 (3:6476) jp ItemUseNotTime ItemUseTMHM: ; e479 (3:6479) - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,ItemUseNotTime ld a,[wcf91] @@ -2337,7 +2337,7 @@ ThrowBallAtTrainerMon: ; e58b (3:658b) call LoadScreenTilesFromBuffer1 ; restore saved screen call Delay3 ld a,TOSS_ANIM - ld [W_ANIMATIONID],a + ld [wAnimationID],a predef MoveAnimation ; do animation ld hl,ThrowBallAtTrainerMonText1 call PrintText @@ -2687,7 +2687,7 @@ IsKeyItem_: ; e764 (3:6764) INCLUDE "data/key_items.asm" SendNewMonToBox: ; e7a4 (3:67a4) - ld de, W_NUMINBOX + ld de, wNumInBox ld a, [de] inc a ld [de], a @@ -2706,7 +2706,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) call GetMonHeader ld hl, wBoxMonOT ld bc, NAME_LENGTH - ld a, [W_NUMINBOX] + ld a, [wNumInBox] dec a jr z, .asm_e7ee dec a @@ -2717,7 +2717,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld d, h ld e, l pop hl - ld a, [W_NUMINBOX] + ld a, [wNumInBox] dec a ld b, a .asm_e7db @@ -2738,7 +2738,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld de, wBoxMonOT ld bc, NAME_LENGTH call CopyData - ld a, [W_NUMINBOX] + ld a, [wNumInBox] dec a jr z, .asm_e82a ld hl, wBoxMonNicks @@ -2751,7 +2751,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld d, h ld e, l pop hl - ld a, [W_NUMINBOX] + ld a, [wNumInBox] dec a ld b, a .asm_e817 @@ -2772,7 +2772,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld a, NAME_MON_SCREEN ld [wNamingScreenType], a predef AskName - ld a, [W_NUMINBOX] + ld a, [wNumInBox] dec a jr z, .asm_e867 ld hl, wBoxMons @@ -2785,7 +2785,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld d, h ld e, l pop hl - ld a, [W_NUMINBOX] + ld a, [wNumInBox] dec a ld b, a .asm_e854 @@ -2816,7 +2816,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld [de], a inc de push de - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] ld d, a callab CalcExperience pop de @@ -2856,12 +2856,12 @@ SendNewMonToBox: ; e7a4 (3:67a4) ; used for surfing and fishing ; unsets carry if it is, sets carry if not IsNextTileShoreOrWater: ; e8b8 (3:68b8) - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] ld hl, WaterTilesets ld de,1 call IsInArray jr nc, .notShoreOrWater - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp SHIP_PORT ; Vermilion Dock tileset ld a, [wTileInFrontOfPlayer] ; tile in front of player jr z, .skipShoreTiles ; if it's the Vermilion Dock tileset @@ -2888,7 +2888,7 @@ ReadSuperRodData: ; e8ea (3:68ea) ; return e = 2 if no fish on this map ; return e = 1 if a bite, bc = level,species ; return e = 0 if no bite - ld a, [W_CURMAP] + ld a, [wCurMap] ld de, 3 ; each fishing group is three bytes wide ld hl, SuperRodData call IsInArray diff --git a/engine/items/tms.asm b/engine/items/tms.asm index 23912b34..7d00f7f3 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -3,7 +3,7 @@ CanLearnTM: ; 1373e (4:773e) ld a, [wcf91] ld [wd0b5], a call GetMonHeader - ld hl, W_MONHLEARNSET + ld hl, wMonHLearnset push hl ld a, [wMoveNum] ld b, a diff --git a/engine/learn_move.asm b/engine/learn_move.asm index c0ced4a0..ede8a542 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -53,7 +53,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b) pop de pop hl ld [hl], a - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a jp z, PrintLearnedMove ld a, [wWhichPokemon] diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index e8e48b79..d367bdb5 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -212,7 +212,7 @@ BillsPCDeposit: ; 215ac (8:55ac) call PrintText jp BillsPCMenu .partyLargeEnough - ld a, [W_NUMINBOX] + ld a, [wNumInBox] cp MONS_PER_BOX jr nz, .boxNotFull ld hl, BoxFullText @@ -254,7 +254,7 @@ BillsPCDeposit: ; 215ac (8:55ac) jp BillsPCMenu BillsPCWithdraw: ; 21618 (8:5618) - ld a, [W_NUMINBOX] + ld a, [wNumInBox] and a jr nz, .boxNotEmpty ld hl, NoMonText @@ -268,7 +268,7 @@ BillsPCWithdraw: ; 21618 (8:5618) call PrintText jp BillsPCMenu .partyNotFull - ld hl, W_NUMINBOX + ld hl, wNumInBox call DisplayMonListMenu jp c, BillsPCMenu call DisplayDepositWithdrawMenu @@ -291,14 +291,14 @@ BillsPCWithdraw: ; 21618 (8:5618) jp BillsPCMenu BillsPCRelease: ; 21673 (8:5673) - ld a, [W_NUMINBOX] + ld a, [wNumInBox] and a jr nz, .loop ld hl, NoMonText call PrintText jp BillsPCMenu .loop - ld hl, W_NUMINBOX + ld hl, wNumInBox call DisplayMonListMenu jp c, BillsPCMenu ld hl, OnceReleasedText @@ -515,7 +515,7 @@ CableClubLeftGameboy:: ; 5824 (8:5825) ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_RIGHT ret nz - ld a, [W_CURMAP] + ld a, [wCurMap] cp TRADE_CENTER ld a, LINK_STATE_START_TRADE jr z, .next @@ -532,7 +532,7 @@ CableClubRightGameboy:: ; 5845 (8:5845) ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_LEFT ret nz - ld a, [W_CURMAP] + ld a, [wCurMap] cp TRADE_CENTER ld a, LINK_STATE_START_TRADE jr z, .next diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 5b8ae7f0..7c31d346 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -10,7 +10,7 @@ PKMNLeaguePC: ; 0x7657e push af xor a ld [hTilesetType], a - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a ld [wUpdateSpritesEnabled], a ld [wHoFTeamIndex2], a ld [wHoFTeamNo], a diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 78830093..7319ec17 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -114,7 +114,7 @@ MainMenu: ; 5af2 (1:5af2) ld a,[wNumHoFTeams] and a jp z,SpecialEnterMap - ld a,[W_CURMAP] ; map ID + ld a,[wCurMap] ; map ID cp a,HALL_OF_FAME jp nz,SpecialEnterMap xor a @@ -128,7 +128,7 @@ InitOptions: ; 5bff (1:5bff) ld a,1 ; no delay ld [wLetterPrintingDelayFlags],a ld a,3 ; medium speed - ld [W_OPTIONS],a + ld [wOptions],a ret LinkMenu: ; 5c0a (1:5c0a) @@ -392,7 +392,7 @@ PrintSaveScreenText: ; 5def (1:5def) PrintNumBadges: ; 5e2f (1:5e2f) push hl - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges ld b, $1 call CountSetBits pop hl @@ -411,12 +411,12 @@ PrintNumOwnedMons: ; 5e42 (1:5e42) jp PrintNumber PrintPlayTime: ; 5e55 (1:5e55) - ld de, W_PLAYTIMEHOURS + 1 + ld de, wPlayTimeHours + 1 lb bc, 1, 3 call PrintNumber ld [hl], $6d inc hl - ld de, W_PLAYTIMEMINUTES + 1 + ld de, wPlayTimeMinutes + 1 lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber @@ -626,13 +626,13 @@ SetOptionsFromCursorPositions: ; 601f (1:601f) res 6,d .storeOptions ld a,d - ld [W_OPTIONS],a + ld [wOptions],a ret ; reads the options variable and places menu cursors in the correct positions within the options menu SetCursorPositionsFromOptions: ; 604c (1:604c) ld hl,TextSpeedOptionData + 1 - ld a,[W_OPTIONS] + ld a,[wOptions] ld c,a and a,$3f push bc diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 703d570a..41f63095 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -2,7 +2,7 @@ AskName: ; 64eb (1:64eb) call SaveScreenTilesToBuffer1 call GetPredefRegisters push hl - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a coord hl, 0, 0 ld b, 4 @@ -30,7 +30,7 @@ AskName: ; 64eb (1:64eb) ld a, NAME_MON_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a jr nz, .inBattle call ReloadMapSpriteTilePatterns @@ -169,7 +169,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld [wAnimCounter], a ld hl, wd730 res 6, [hl] - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a jp z, LoadTextBoxTilePatterns jpab LoadHudTilePatterns diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index 409f0bdb..434a1943 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -78,7 +78,7 @@ GetPrizeMenuId: ; 5278e (14:678e) ld e,a inc hl push hl - ld hl,W_PRIZE1 + ld hl,wPrize1 call CopyString pop hl ld a,[hli] @@ -90,34 +90,34 @@ GetPrizeMenuId: ; 5278e (14:678e) ld a,[wWhichPrizeWindow] cp a,$02 ;is TM_menu? jr nz,.putMonName - ld a,[W_PRIZE1] + ld a,[wPrize1] ld [wd11e],a call GetItemName coord hl, 2, 4 call PlaceString - ld a,[W_PRIZE2] + ld a,[wPrize2] ld [wd11e],a call GetItemName coord hl, 2, 6 call PlaceString - ld a,[W_PRIZE3] + ld a,[wPrize3] ld [wd11e],a call GetItemName coord hl, 2, 8 call PlaceString jr .putNoThanksText .putMonName - ld a,[W_PRIZE1] + ld a,[wPrize1] ld [wd11e],a call GetMonName coord hl, 2, 4 call PlaceString - ld a,[W_PRIZE2] + ld a,[wPrize2] ld [wd11e],a call GetMonName coord hl, 2, 6 call PlaceString - ld a,[W_PRIZE3] + ld a,[wPrize3] ld [wd11e],a call GetMonName coord hl, 2, 8 @@ -191,7 +191,7 @@ HandlePrizeChoice: ; 528c6 (14:68c6) ld [wWhichPrize],a ld d,0 ld e,a - ld hl,W_PRIZE1 + ld hl,wPrize1 add hl,de ld a,[hl] ld [wd11e],a @@ -300,7 +300,7 @@ GetPrizeMonLevel: ; 52977 (14:6977) jr .loop .matchFound ld a,[hl] - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a ret INCLUDE "data/prize_mon_levels.asm" diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 678877ef..f7bb5a46 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -117,7 +117,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) ld a,[hli] ld h,[hl] ld l,a - ld a,[W_OBTAINEDBADGES] ; badges obtained + ld a,[wObtainedBadges] ; badges obtained jp [hl] .outOfBattleMovePointers dw .cut @@ -601,12 +601,12 @@ DrawTrainerInfo: ; 1349a (4:749a) ld c,$e3 call PrintBCDNumber coord hl, 9, 6 - ld de,W_PLAYTIMEHOURS + 1 ; hours + ld de,wPlayTimeHours + 1 ; hours lb bc, LEFT_ALIGN | 1, 3 call PrintNumber ld [hl],$d6 ; colon tile ID inc hl - ld de,W_PLAYTIMEMINUTES + 1 ; minutes + ld de,wPlayTimeMinutes + 1 ; minutes lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index c91d5eda..d07cc026 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -71,7 +71,7 @@ StatusScreen: ; 12953 (4:6953) ; mon is in a box or daycare ld a, [wLoadedMonBoxLevel] ld [wLoadedMonLevel], a - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld hl, wLoadedMonHPExp - 1 ld de, wLoadedMonStats ld b, $1 @@ -138,7 +138,7 @@ StatusScreen: ; 12953 (4:6953) call PlaceString ; "STATUS/" coord hl, 14, 2 call PrintLevel ; Pokémon level - ld a, [W_MONHINDEX] + ld a, [wMonHIndex] ld [wd11e], a ld [wd0b5], a predef IndexToPokedex @@ -196,13 +196,13 @@ OTPointers: ; 12a95 (4:6a95) dw wPartyMonOT dw wEnemyMonOT dw wBoxMonOT - dw W_DAYCAREMONOT + dw wDayCareMonOT NamePointers2: ; 12a9d (4:6a9d) dw wPartyMonNicks dw wEnemyMonNicks dw wBoxMonNicks - dw W_DAYCAREMONNAME + dw wDayCareMonName Type1Text: ; 12aa5 (4:6aa5) db "TYPE1/", $4e @@ -417,7 +417,7 @@ StatusScreen2: ; 12b57 (4:6b57) call StatusScreen_ClearName coord hl, 9, 1 call StatusScreen_ClearName - ld a, [W_MONHINDEX] + ld a, [wMonHIndex] ld [wd11e], a call GetMonName coord hl, 9, 1 diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 48e8da80..d5f13a7a 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -1,7 +1,7 @@ SetDefaultNames: ; 60ca (1:60ca) ld a, [wLetterPrintingDelayFlags] push af - ld a, [W_OPTIONS] + ld a, [wOptions] push af ld a, [wd732] push af @@ -16,7 +16,7 @@ SetDefaultNames: ; 60ca (1:60ca) pop af ld [wd732], a pop af - ld [W_OPTIONS], a + ld [wOptions], a pop af ld [wLetterPrintingDelayFlags], a ld a, [wOptionsInitialized] @@ -27,7 +27,7 @@ SetDefaultNames: ; 60ca (1:60ca) ld bc, NAME_LENGTH call CopyData ld hl, SonyText - ld de, W_RIVALNAME + ld de, wRivalName ld bc, NAME_LENGTH jp CopyData diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 673c13ad..9b5622b8 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -40,11 +40,11 @@ ChooseRivalName: ; 69a4 (1:69a4) jr z, .customName ld hl, DefaultNamesRivalList call GetDefaultName - ld de, W_RIVALNAME + ld de, wRivalName call OakSpeechSlidePicLeft jr .done .customName - ld hl, W_RIVALNAME + ld hl, wRivalName ld a, NAME_RIVAL_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index cc9fe3a7..2ef7529c 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -1,6 +1,6 @@ PrintCardKeyText: ; 52673 (14:6673) ld hl, SilphCoMapList - ld a, [W_CURMAP] + ld a, [wCurMap] ld b, a .silphCoMapListLoop ld a, [hli] @@ -15,7 +15,7 @@ PrintCardKeyText: ; 52673 (14:6673) cp $24 jr z, .cardKeyDoorInFrontOfPlayer ld b, a - ld a, [W_CURMAP] + ld a, [wCurMap] cp SILPH_CO_11F ret nz ld a, b @@ -39,7 +39,7 @@ PrintCardKeyText: ; 52673 (14:6673) ld a, e ld c, a ld [wCardKeyDoorX], a - ld a, [W_CURMAP] + ld a, [wCurMap] cp SILPH_CO_11F jr nz, .notSilphCo11F ld a, $3 @@ -84,9 +84,9 @@ CardKeyFailText: ; 526f8 (14:66f8) ; d = Y ; e = X GetCoordsInFrontOfPlayer: ; 526fd (14:66fd) - ld a, [W_YCOORD] + ld a, [wYCoord] ld d, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld e, a ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction and a diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index f81324e0..f7c5e326 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -48,9 +48,9 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) .choseDomeFossil ld b, KABUTO .fossilSelected - ld [W_FOSSILITEM], a + ld [wFossilItem], a ld a, b - ld [W_FOSSILMON], a + ld [wFossilMon], a call LoadFossilItemAndMonName ld hl, LabFossil_610ae call PrintText @@ -60,7 +60,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) jr nz, .cancelledGivingFossil ld hl, LabFossil_610b3 call PrintText - ld a, [W_FOSSILITEM] + ld a, [wFossilItem] ld [hItemToRemoveID], a callba RemoveItemByID ld hl, LabFossil_610b8 @@ -113,11 +113,11 @@ PrintFossilsInBag: ; 610c2 (18:50c2) ; loads the names of the fossil item and the resulting mon LoadFossilItemAndMonName: ; 610eb (18:50eb) - ld a, [W_FOSSILMON] + ld a, [wFossilMon] ld [wd11e], a call GetMonName call CopyStringToCF4B - ld a, [W_FOSSILITEM] + ld a, [wFossilItem] ld [wd11e], a call GetItemName ret diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 30aedbc1..8a0513b2 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -1,7 +1,7 @@ UsedCut: ; ef54 (3:6f54) xor a ld [wActionResultOrTookBattleTurn], a ; initialise to failure value - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] and a ; OVERWORLD jr z, .overworld cp GYM @@ -177,7 +177,7 @@ ReplaceTreeTileBlock: ; f09f (3:709f) ; player (i.e. where the tree is) and replace it with the corresponding tile ; block that doesn't have the tree. push de - ld a, [W_CURMAPWIDTH] + ld a, [wCurMapWidth] add 6 ld c, a ld b, 0 @@ -195,22 +195,22 @@ ReplaceTreeTileBlock: ; f09f (3:709f) cp SPRITE_FACING_LEFT jr z, .left ; right - ld a, [W_XBLOCKCOORD] + ld a, [wXBlockCoord] and a jr z, .centerTileBlock jr .rightOfCenter .down - ld a, [W_YBLOCKCOORD] + ld a, [wYBlockCoord] and a jr z, .centerTileBlock jr .belowCenter .up - ld a, [W_YBLOCKCOORD] + ld a, [wYBlockCoord] and a jr z, .aboveCenter jr .centerTileBlock .left - ld a, [W_XBLOCKCOORD] + ld a, [wXBlockCoord] and a jr z, .leftOfCenter jr .centerTileBlock diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index 641c021f..6b0c0464 100755 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -2,7 +2,7 @@ IsPlayerStandingOnDoorTile: ; 1a609 (6:6609) push de ld hl, DoorTileIDPointers - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] ld de, $3 call IsInArray pop de diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 28528116..f7f81070 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -135,7 +135,7 @@ FindHiddenItemOrCoinsIndex: ; 76857 (1d:6857) ld d, a ld a, [wHiddenObjectX] ld e, a - ld a, [W_CURMAP] + ld a, [wCurMap] ld b, a ld c, -1 .loop diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm index cabfc093..1fc20e5c 100755 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm @@ -29,7 +29,7 @@ CheckForHiddenObject: ; 469a0 (11:69a0) ld b, a cp $ff jr z, .noMatch - ld a, [W_CURMAP] + ld a, [wCurMap] cp b jr z, .foundMatchingMap inc de @@ -95,30 +95,30 @@ CheckIfCoordsInFrontOfPlayerMatch: ; 46a01 (11:6a01) cp SPRITE_FACING_RIGHT jr z, .facingRight ; facing down - ld a, [W_YCOORD] + ld a, [wYCoord] inc a jr .upDownCommon .facingUp - ld a, [W_YCOORD] + ld a, [wYCoord] dec a .upDownCommon cp b jr nz, .didNotMatch - ld a, [W_XCOORD] + ld a, [wXCoord] cp c jr nz, .didNotMatch jr .matched .facingLeft - ld a, [W_XCOORD] + ld a, [wXCoord] dec a jr .leftRightCommon .facingRight - ld a, [W_XCOORD] + ld a, [wXCoord] inc a .leftRightCommon cp c jr nz, .didNotMatch - ld a, [W_YCOORD] + ld a, [wYCoord] cp b jr nz, .didNotMatch .matched diff --git a/engine/overworld/is_player_just_outside_map.asm b/engine/overworld/is_player_just_outside_map.asm index 24e434b3..e9ba204a 100644 --- a/engine/overworld/is_player_just_outside_map.asm +++ b/engine/overworld/is_player_just_outside_map.asm @@ -1,13 +1,13 @@ ; returns whether the player is one tile outside the map in Z IsPlayerJustOutsideMap: ; 128d8 (4:68d8) - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_CURMAPHEIGHT] + ld a, [wCurMapHeight] call .compareCoordWithMapDimension ret z - ld a, [W_XCOORD] + ld a, [wXCoord] ld b, a - ld a, [W_CURMAPWIDTH] + ld a, [wCurMapWidth] .compareCoordWithMapDimension add a cp b diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index 6fbe823d..63eecef9 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -3,7 +3,7 @@ PickUpItem: ld a, [hSpriteIndexOrTextID] ld b, a - ld hl, W_MISSABLEOBJECTLIST + ld hl, wMissableObjectList .missableObjectsListLoop ld a, [hli] cp $ff @@ -17,7 +17,7 @@ PickUpItem: ld a, [hl] ld [$ffdb], a - ld hl, W_MAPSPRITEEXTRADATA + ld hl, wMapSpriteExtraData ld a, [hSpriteIndexOrTextID] dec a add a diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index df4273fd..b04f6332 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -2,7 +2,7 @@ HandleLedges: ; 1a672 (6:6672) ld a, [wd736] bit 6, a ; already jumping down ledge ret nz - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] and a ; OVERWORLD ret nz predef GetTileAndCoordsInFrontOfPlayer diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index 33411dfc..bdd3320b 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -30,12 +30,12 @@ InitMapSprites: ; 1785b (5:785b) ; InitOutsideMapSprites. ; Loads tile pattern data for sprites into VRAM. LoadMapSpriteTilePatterns: ; 17871 (5:7871) - ld a,[W_NUMSPRITES] + ld a,[wNumSprites] and a ; are there any sprites? jr nz,.spritesExist ret .spritesExist - ld c,a ; c = [W_NUMSPRITES] + ld c,a ; c = [wNumSprites] ld b,$10 ; number of sprite slots ld hl,wSpriteStateData2 + $0d xor a @@ -251,7 +251,7 @@ ReadSpriteSheetData: ; 17971 (5:7971) ; Loads sprite set for outside maps (cities and routes) and sets VRAM slots. ; sets carry if the map is a city or route, unsets carry if not InitOutsideMapSprites: ; 1797b (5:797b) - ld a,[W_CURMAP] + ld a,[wCurMap] cp a,REDS_HOUSE_1F ; is the map a city or a route (map ID less than $25)? ret nc ; if not, return ld hl,MapSpriteSets @@ -267,12 +267,12 @@ InitOutsideMapSprites: ; 1797b (5:797b) ld a,[wFontLoaded] bit 0,a ; reloading upper half of tile patterns after displaying text? jr nz,.loadSpriteSet ; if so, forcibly reload the sprite set - ld a,[W_SPRITESETID] + ld a,[wSpriteSetID] cp b ; has the sprite set ID changed? jr z,.skipLoadingSpriteSet ; if not, don't load it again .loadSpriteSet ld a,b - ld [W_SPRITESETID],a + ld [wSpriteSetID],a dec a ld b,a sla a @@ -291,7 +291,7 @@ InitOutsideMapSprites: ; 1797b (5:797b) ld hl,wSpriteStateData2 + $0d ld a,SPRITE_RED ld [hl],a - ld bc,W_SPRITESET + ld bc,wSpriteSet ; Load the sprite set into RAM. ; This loop also fills $C2XD (sprite picture ID) where X is from $0 to $A ; with picture ID's. This is done so that LoadMapSpriteTilePatterns will @@ -317,13 +317,13 @@ InitOutsideMapSprites: ; 1797b (5:797b) ld [hl],a ; $C2XD (sprite picture ID) dec b jr nz,.zeroRemainingSlotsLoop - ld a,[W_NUMSPRITES] + ld a,[wNumSprites] push af ; save number of sprites ld a,11 ; 11 sprites in sprite set - ld [W_NUMSPRITES],a + ld [wNumSprites],a call LoadMapSpriteTilePatterns pop af - ld [W_NUMSPRITES],a ; restore number of sprites + ld [wNumSprites],a ; restore number of sprites ld hl,wSpriteStateData2 + $1e ld b,$0f ; The VRAM tile pattern slots that LoadMapSpriteTilePatterns set are in the @@ -352,7 +352,7 @@ InitOutsideMapSprites: ; 1797b (5:797b) and a ; is the sprite slot used? jr z,.skipGettingPictureIndex ; if the sprite slot is not used ld b,a ; b = picture ID - ld de,W_SPRITESET + ld de,wSpriteSet ; Loop to find the index of the sprite's picture ID within the sprite set. .getPictureIndexLoop inc c @@ -399,10 +399,10 @@ GetSplitMapSpriteSetID: ; 17a1a (5:7a1a) ld b,a jr z,.eastWestDivide .northSouthDivide - ld a,[W_YCOORD] + ld a,[wYCoord] jr .compareCoord .eastWestDivide - ld a,[W_XCOORD] + ld a,[wXCoord] .compareCoord cp b jr c,.loadSpriteSetID @@ -415,7 +415,7 @@ GetSplitMapSpriteSetID: ; 17a1a (5:7a1a) ; Route 20 is a special case because the two map sections have a more complex ; shape instead of the map simply being split horizontally or vertically. .route20 - ld hl,W_XCOORD + ld hl,wXCoord ld a,[hl] cp a,$2b ld a,$01 @@ -430,7 +430,7 @@ GetSplitMapSpriteSetID: ; 17a1a (5:7a1a) jr nc,.next ld b,$0d .next - ld a,[W_YCOORD] + ld a,[wYCoord] cp b ld a,$0a ret c diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 2ed49838..c89406d1 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -89,7 +89,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31) ; bit set by later logic. ld a, [hTilePlayerStandingOn] ld c, a - ld a, [W_GRASSTILE] + ld a, [wGrassTile] cp c ld a, $0 jr nz, .next2 @@ -114,7 +114,7 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) swap a dec a add a - ld hl, W_MAPSPRITEDATA + ld hl, wMapSpriteData add l ld l, a ld a, [hl] ; read movement byte 2 @@ -453,7 +453,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd) ld a, [H_CURRENTSPRITEOFFSET] add $4 ld l, a - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a ld a, [hl] ; c2x4 (Y position + 4) sub b ; relative to player position @@ -462,7 +462,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd) dec h ld [hli], a ; c1x4 (screen Y position) inc h - ld a, [W_XCOORD] + ld a, [wXCoord] ld b, a ld a, [hli] ; c2x6 (X position + 4) sub b ; relative to player position @@ -488,7 +488,7 @@ CheckSpriteAvailability: ; 50dc (1:50dc) add $4 ld l, a ld b, [hl] ; c2x4: Y pos (+4) - ld a, [W_YCOORD] + ld a, [wYCoord] cp b jr z, .skipYVisibilityTest jr nc, .spriteInvisible ; above screen region @@ -498,7 +498,7 @@ CheckSpriteAvailability: ; 50dc (1:50dc) .skipYVisibilityTest inc l ld b, [hl] ; c2x5: X pos (+4) - ld a, [W_XCOORD] + ld a, [wXCoord] cp b jr z, .skipXVisibilityTest jr nc, .spriteInvisible ; left of screen region @@ -542,7 +542,7 @@ CheckSpriteAvailability: ; 50dc (1:50dc) ld a, [H_CURRENTSPRITEOFFSET] add $7 ld l, a - ld a, [W_GRASSTILE] + ld a, [wGrassTile] cp c ld a, $0 jr nz, .notInGrass @@ -590,9 +590,9 @@ CanWalkOntoTile: ; 516e (1:516e) and a ret .notScripted - ld a, [W_TILESETCOLLISIONPTR] + ld a, [wTileSetCollisionPtr] ld l, a - ld a, [W_TILESETCOLLISIONPTR+1] + ld a, [wTileSetCollisionPtr+1] ld h, a .tilePassableLoop ld a, [hli] diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 098be875..719c8835 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -52,7 +52,7 @@ PalletMovementScriptPointerTable: ; 1a442 (6:6442) dw PalletMovementScript_Done PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c) - ld a, [W_XCOORD] + ld a, [wXCoord] sub $a ld [wNumStepsToTake], a jr z, .playerOnLeftTile @@ -79,7 +79,7 @@ PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c) ld a, $3 ld [wNPCMovementScriptFunctionNum], a .done - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 1, [hl] ld a, $fc ld [wJoyIgnore], a @@ -267,7 +267,7 @@ RLEList_PewterGymGuy: ; 1a5da (6:65da) db $FF FreezeEnemyTrainerSprite: ; 1a5e7 (6:65e7) - ld a, [W_CURMAP] + ld a, [wCurMap] cp POKEMONTOWER_7 ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them ld hl, RivalIDs diff --git a/engine/overworld/pewter_guys.asm b/engine/overworld/pewter_guys.asm index 4ac60e00..543dac91 100755 --- a/engine/overworld/pewter_guys.asm +++ b/engine/overworld/pewter_guys.asm @@ -17,9 +17,9 @@ PewterGuys: ; 37ca1 (d:7ca1) ld a, [hli] ld h, [hl] ld l, a - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a .findMatchingCoordsLoop ld a, [hli] diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 74762b00..de36eeaf 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -5,7 +5,7 @@ EnterMapAnim: ; 70510 (1c:4510) call Delay3 push hl call GBFadeInFromWhite - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 bit 7, [hl] ; used fly out of battle? res 7, [hl] jr nz, .flyAnimation @@ -350,7 +350,7 @@ GetPlayerTeleportAnimFrameDelay: ; 7077f (1c:477f) IsPlayerStandingOnWarpPadOrHole: ; 70787 (1c:4787) ld b, 0 ld hl, .warpPadAndHoleData - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] ld c, a .loop ld a, [hli] diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm index 7d2ec0dd..66ae20ce 100755 --- a/engine/overworld/trainers.asm +++ b/engine/overworld/trainers.asm @@ -291,7 +291,7 @@ CheckSpriteCanSeePlayer: ; 569af (15:69af) ; tests if the player is in front of the sprite (rather than behind it) CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3) - ld a, [W_CURMAP] + ld a, [wCurMap] cp POWER_PLANT jp z, .engage ; bypass this for power plant to get voltorb fake items to work ld a, [wTrainerSpriteOffset] diff --git a/engine/palettes.asm b/engine/palettes.asm index 55d488aa..94466533 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -30,11 +30,11 @@ SetPal_Battle: ; 71e06 (1c:5e06) ld de, wPalPacket ld bc, $10 call CopyData - ld a, [W_PLAYERBATTSTATUS3] + ld a, [wPlayerBattleStatus3] ld hl, wBattleMonSpecies call DeterminePaletteID ld b, a - ld a, [W_ENEMYBATTSTATUS3] + ld a, [wEnemyBattleStatus3] ld hl, wEnemyMonSpecies2 call DeterminePaletteID ld c, a @@ -139,12 +139,12 @@ SetPal_Overworld: ; 71ec7 (1c:5ec7) ld de, wPalPacket ld bc, $10 call CopyData - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp CEMETERY jr z, .PokemonTowerOrAgatha cp CAVERN jr z, .caveOrBruno - ld a, [W_CURMAP] + ld a, [wCurMap] cp REDS_HOUSE_1F jr c, .townOrRoute cp UNKNOWN_DUNGEON_2 @@ -207,7 +207,7 @@ SetPal_TrainerCard: ; 71f3b (1c:5f3b) call CopyData ld de, BadgeBlkDataLengths ld hl, wTrainerCardBlkPacket + 2 - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] ld c, 8 .badgeLoop srl a diff --git a/engine/play_time.asm b/engine/play_time.asm index 74da9c59..237883ed 100755 --- a/engine/play_time.asm +++ b/engine/play_time.asm @@ -3,37 +3,37 @@ TrackPlayTime: ; 18dee (6:4dee) ld a, [wd732] bit 0, a ret z - ld a, [W_PLAYTIMEMINUTES] + ld a, [wPlayTimeMinutes] and a ret nz - ld a, [W_PLAYTIMEFRAMES] + ld a, [wPlayTimeFrames] inc a - ld [W_PLAYTIMEFRAMES], a + ld [wPlayTimeFrames], a cp 60 ret nz xor a - ld [W_PLAYTIMEFRAMES], a - ld a, [W_PLAYTIMESECONDS] + ld [wPlayTimeFrames], a + ld a, [wPlayTimeSeconds] inc a - ld [W_PLAYTIMESECONDS], a + ld [wPlayTimeSeconds], a cp 60 ret nz xor a - ld [W_PLAYTIMESECONDS], a - ld a, [W_PLAYTIMEMINUTES + 1] + ld [wPlayTimeSeconds], a + ld a, [wPlayTimeMinutes + 1] inc a - ld [W_PLAYTIMEMINUTES + 1], a + ld [wPlayTimeMinutes + 1], a cp 60 ret nz xor a - ld [W_PLAYTIMEMINUTES + 1], a - ld a, [W_PLAYTIMEHOURS + 1] + ld [wPlayTimeMinutes + 1], a + ld a, [wPlayTimeHours + 1] inc a - ld [W_PLAYTIMEHOURS + 1], a + ld [wPlayTimeHours + 1], a cp $ff ret nz ld a, $ff - ld [W_PLAYTIMEMINUTES], a + ld [wPlayTimeMinutes], a ret CountDownIgnoreInputBitReset: ; 18e36 (6:4e36) diff --git a/engine/predefs17_2.asm b/engine/predefs17_2.asm index a2dac120..c0df7d0a 100755 --- a/engine/predefs17_2.asm +++ b/engine/predefs17_2.asm @@ -8,8 +8,8 @@ SetPartyMonTypes: ; 5db5e (17:5b5e) push hl call GetMonHeader pop hl - ld a, [W_MONHTYPE1] + ld a, [wMonHType1] ld [hli], a - ld a, [W_MONHTYPE2] + ld a, [wMonHType2] ld [hl], a ret diff --git a/engine/save.asm b/engine/save.asm index a7b2a7c0..e47be58a 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -63,7 +63,7 @@ LoadSAV0: ; 73623 (1c:7623) ld de, wMainDataStart ld bc, wMainDataEnd - wMainDataStart call CopyData - ld hl, W_CURMAPTILESET + ld hl, wCurMapTileset set 7, [hl] ld hl, sSpriteData ld de, wSpriteDataStart @@ -369,7 +369,7 @@ ChangeBox:: ; 738a1 (1c:78a1) call GetBoxSRAMLocation ld de, wBoxDataStart call CopyBoxToOrFromSRAM ; copy new box from SRAM to WRAM - ld hl, W_MAPTEXTPTR + ld hl, wMapTextPtr ld de, wChangeBoxSavedMapTextPointer ld a, [hli] ld [de], a @@ -580,7 +580,7 @@ GetMonCountsForAllBoxes: ; 73a84 (1c:7a84) ld c, a ld b, 0 add hl, bc - ld a, [W_NUMINBOX] + ld a, [wNumInBox] ld [hl], a ret diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 78ce35a2..b2917459 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -758,7 +758,7 @@ SlotMachine_AnimWheel1: ; 37813 (d:7813) ld de, wSlotMachineWheel1Offset ld hl, wOAMBuffer ld a, $30 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a jr SlotMachine_AnimWheel SlotMachine_AnimWheel2: ; 37823 (d:7823) @@ -766,7 +766,7 @@ SlotMachine_AnimWheel2: ; 37823 (d:7823) ld de, wSlotMachineWheel2Offset ld hl, wOAMBuffer + $30 ld a, $50 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a jr SlotMachine_AnimWheel SlotMachine_AnimWheel3: ; 37833 (d:7833) @@ -774,11 +774,11 @@ SlotMachine_AnimWheel3: ; 37833 (d:7833) ld de, wSlotMachineWheel3Offset ld hl, wOAMBuffer + $60 ld a, $70 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a SlotMachine_AnimWheel: ; 37841 (d:7841) ld a, $58 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a push de ld a, [de] ld d, b @@ -787,17 +787,17 @@ SlotMachine_AnimWheel: ; 37841 (d:7841) jr nc, .loop inc d .loop - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] ld [hli], a ld a, [de] ld [hli], a ld a, $80 ld [hli], a - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] add $8 ld [hli], a ld a, [de] @@ -806,9 +806,9 @@ SlotMachine_AnimWheel: ; 37841 (d:7841) ld a, $80 ld [hli], a inc de - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] sub $8 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a cp $28 jr nz, .loop pop de diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index b0bf0fb6..cbe19d6d 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -8,7 +8,7 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) ld de, wPlayerName call CopyFixedLengthText ld hl, SonyText - ld de, W_RIVALNAME + ld de, wRivalName call CopyFixedLengthText xor a ld [hWY], a diff --git a/engine/town_map.asm b/engine/town_map.asm index 8bf11358..727197de 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -7,7 +7,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) push hl ld a, $1 ld [hJoy7], a - ld a, [W_CURMAP] + ld a, [wCurMap] push af ld b, $0 call DrawPlayerOrBirdSprite ; player sprite @@ -156,7 +156,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) coord hl, 0, 0 ld de, ToText call PlaceString - ld a, [W_CURMAP] + ld a, [wCurMap] ld b, $0 call DrawPlayerOrBirdSprite ld hl, wFlyLocationsList @@ -250,9 +250,9 @@ BuildFlyLocationsList: ; 71070 (1c:5070) ld hl, wFlyLocationsList - 1 ld [hl], $ff inc hl - ld a, [W_TOWNVISITEDFLAG] + ld a, [wTownVisitedFlag] ld e, a - ld a, [W_TOWNVISITEDFLAG + 1] + ld a, [wTownVisitedFlag + 1] ld d, a ld bc, SAFFRON_CITY + 1 .loop @@ -405,7 +405,7 @@ DisplayWildLocations: ; 711ef (1c:51ef) call PlaceString jr .done .drawPlayerSprite - ld a, [W_CURMAP] + ld a, [wCurMap] ld b, $0 call DrawPlayerOrBirdSprite .done diff --git a/engine/trade.asm b/engine/trade.asm index 66afa47e..1642e729 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -18,14 +18,14 @@ ExternalClockTradeAnim: ; 410f3 (10:50f3) ld de, ExternalClockTradeFuncSequence TradeAnimCommon: ; 41102 (10:5102) - ld a, [W_OPTIONS] + ld a, [wOptions] push af ld a, [hSCY] push af ld a, [hSCX] push af xor a - ld [W_OPTIONS], a + ld [wOptions], a ld [hSCY], a ld [hSCX], a push de @@ -53,7 +53,7 @@ TradeAnimCommon: ; 41102 (10:5102) pop af ld [hSCY], a pop af - ld [W_OPTIONS], a + ld [wOptions], a ret addtradefunc: MACRO @@ -383,9 +383,9 @@ Trade_AnimLeftToRight: ; 41376 (10:5376) ld a, $e4 ld [rOBP0], a ld a, $54 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld a, $1c - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld a, [wLeftGBMonSpecies] ld [wMonPartySpriteSpecies], a call Trade_WriteCircledMonOAM @@ -415,9 +415,9 @@ Trade_AnimRightToLeft: ; 413c6 (10:53c6) xor a ld [wTradedMonMovingRight], a ld a, $64 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld a, $44 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld a, [wRightGBMonSpecies] ld [wMonPartySpriteSpecies], a call Trade_WriteCircledMonOAM @@ -622,10 +622,10 @@ Trade_AddOffsetsToOAMCoords: ; 41510 (10:5510) ld hl, wOAMBuffer ld c, $14 .loop - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] add [hl] ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] add [hl] ld [hli], a inc hl @@ -657,9 +657,9 @@ Trade_AnimMonMoveVertical: ; 41525 (10:5525) lb bc, -4, 0 ; move left .doAnim ld a, b - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld a, c - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld d, $4 .loop call Trade_AddOffsetsToOAMCoords @@ -847,7 +847,7 @@ TradeforText: ; 41671 (10:5671) db "@" Trade_ShowAnimation: ; 41676 (10:5676) - ld [W_ANIMATIONID], a + ld [wAnimationID], a xor a ld [wAnimationType], a predef_jump MoveAnimation diff --git a/home.asm b/home.asm index c0e51b58..0a8bb9a5 100644 --- a/home.asm +++ b/home.asm @@ -240,7 +240,7 @@ DrawHPBar:: ; 1336 (0:1336) ; loads pokemon data from one of multiple sources to wLoadedMon -; loads base stats to W_MONHEADER +; loads base stats to wMonHeader ; INPUT: ; [wWhichPokemon] = index of pokemon within party/box ; [wMonDataLocation] = source @@ -251,7 +251,7 @@ DrawHPBar:: ; 1336 (0:1336) ; OUTPUT: ; [wcf91] = pokemon ID ; wLoadedMon = base address of pokemon data -; W_MONHEADER = base address of base stats +; wMonHeader = base address of base stats LoadMonData:: ; 1372 (0:1372) jpab LoadMonData_ @@ -268,7 +268,7 @@ OverwritewMoves:: ; 137a (0:137a) LoadFlippedFrontSpriteByMonIndex:: ; 1384 (0:1384) ld a, 1 - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a LoadFrontSpriteByMonIndex:: ; 1389 (0:1389) push hl @@ -304,7 +304,7 @@ LoadFrontSpriteByMonIndex:: ; 1389 (0:1389) ld [hStartTileID], a call CopyUncompressedPicToHL xor a - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a pop af ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a @@ -551,7 +551,7 @@ GetwMoves:: ; 152e (0:152e) ld a,[hl] ret -; copies the base stat data of a pokemon to W_MONHEADER +; copies the base stat data of a pokemon to wMonHeader ; INPUT: ; [wd0b5] = pokemon ID GetMonHeader:: ; 1537 (0:1537) @@ -586,12 +586,12 @@ GetMonHeader:: ; 1537 (0:1537) ld bc,MonBaseStatsEnd - MonBaseStats ld hl,BaseStats call AddNTimes - ld de,W_MONHEADER + ld de,wMonHeader ld bc,MonBaseStatsEnd - MonBaseStats call CopyData jr .done .specialID - ld hl,W_MONHSPRITEDIM + ld hl,wMonHSpriteDim ld [hl],b ; write sprite dimensions inc hl ld [hl],e ; write front sprite pointer @@ -600,13 +600,13 @@ GetMonHeader:: ; 1537 (0:1537) jr .done .mew ld hl,MewBaseStats - ld de,W_MONHEADER + ld de,wMonHeader ld bc,MonBaseStatsEnd - MonBaseStats ld a,BANK(MewBaseStats) call FarCopyData .done ld a,[wd0b5] - ld [W_MONHINDEX],a + ld [wMonHIndex],a pop af ld [wd11e],a pop hl @@ -718,12 +718,12 @@ PrintBCDDigit:: ; 1604 (0:1604) ; assumes the corresponding mon header is already loaded ; hl contains offset to sprite pointer ($b for front or $d for back) UncompressMonSprite:: ; 1627 (0:1627) - ld bc,W_MONHEADER + ld bc,wMonHeader add hl,bc ld a,[hli] - ld [W_SPRITEINPUTPTR],a ; fetch sprite input pointer + ld [wSpriteInputPtr],a ; fetch sprite input pointer ld a,[hl] - ld [W_SPRITEINPUTPTR+1],a + ld [wSpriteInputPtr+1],a ; define (by index number) the bank that a pokemon's image is in ; index = Mew, bank 1 ; index = Kabutops fossil, bank $B @@ -764,9 +764,9 @@ UncompressMonSprite:: ; 1627 (0:1627) ; de: destination location LoadMonFrontSprite:: ; 1665 (0:1665) push de - ld hl, W_MONHFRONTSPRITE - W_MONHEADER + ld hl, wMonHFrontSprite - wMonHeader call UncompressMonSprite - ld hl, W_MONHSPRITEDIM + ld hl, wMonHSpriteDim ld a, [hli] ld c, a pop de @@ -891,7 +891,7 @@ InterlaceMergeSpriteBuffers:: ; 16ea (0:16ea) dec a ld [H_SPRITEINTERLACECOUNTER], a jr nz, .interlaceLoop - ld a, [W_SPRITEFLIPPED] + ld a, [wSpriteFlipped] and a jr z, .notFlipped ld bc, 2*SPRITEBUFFERSIZE @@ -1057,12 +1057,12 @@ DisplayTextID:: ; 2920 (0:2920) bit 0,[hl] res 0,[hl] jr nz,.skipSwitchToMapBank - ld a,[W_CURMAP] + ld a,[wCurMap] call SwitchToMapRomBank .skipSwitchToMapBank ld a,30 ; half a second ld [H_FRAMECOUNTER],a ; used as joypad poll timer - ld hl,W_MAPTEXTPTR + ld hl,wMapTextPtr ld a,[hli] ld h,[hl] ld l,a ; hl = map text pointer @@ -1079,7 +1079,7 @@ DisplayTextID:: ; 2920 (0:2920) jp z,DisplayPlayerBlackedOutText cp a,TEXT_REPEL_WORE_OFF jp z,DisplayRepelWoreOffText - ld a,[W_NUMSPRITES] + ld a,[wNumSprites] ld e,a ld a,[hSpriteIndexOrTextID] ; sprite ID cp e @@ -1093,7 +1093,7 @@ DisplayTextID:: ; 2920 (0:2920) callba UpdateSpriteFacingOffsetAndDelayMovement ; update the graphics of the sprite the player is talking to (to face the right direction) pop bc pop de - ld hl,W_MAPSPRITEDATA ; NPC text entries + ld hl,wMapSpriteData ; NPC text entries ld a,[hSpriteIndexOrTextID] dec a add a @@ -1157,7 +1157,7 @@ HoldTextDisplayOpen:: ; 29df (0:29df) jr nz,HoldTextDisplayOpen CloseTextDisplay:: ; 29e8 (0:29e8) - ld a,[W_CURMAP] + ld a,[wCurMap] call SwitchToMapRomBank ld a,$90 ld [hWY],a ; move the window off the screen @@ -1376,7 +1376,7 @@ DisplayListMenuID:: ; 2be6 (0:2be6) ld [H_AUTOBGTRANSFERENABLED],a ; disable auto-transfer ld a,1 ld [hJoy7],a ; joypad state update flag - ld a,[W_BATTLETYPE] + ld a,[wBattleType] and a ; is it the Old Man battle? jr nz,.specialBattleType ld a,$01 ; hardcoded bank @@ -1432,7 +1432,7 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) ld a,1 ld [H_AUTOBGTRANSFERENABLED],a ; enable transfer call Delay3 - ld a,[W_BATTLETYPE] + ld a,[wBattleType] and a ; is it the Old Man battle? jr z,.notOldManBattle .oldManBattle @@ -2043,7 +2043,7 @@ GetMoveName:: ; 3058 (0:3058) ReloadMapData:: ; 3071 (0:3071) ld a,[H_LOADEDROMBANK] push af - ld a,[W_CURMAP] + ld a,[wCurMap] call SwitchToMapRomBank call DisableLCD call LoadTextBoxTilePatterns @@ -2059,7 +2059,7 @@ ReloadMapData:: ; 3071 (0:3071) ReloadTilesetTilePatterns:: ; 3090 (0:3090) ld a,[H_LOADEDROMBANK] push af - ld a,[W_CURMAP] + ld a,[wCurMap] call SwitchToMapRomBank call DisableLCD call LoadTilesetTilePatternData @@ -2202,12 +2202,12 @@ EndNPCMovementScript:: ; 314e (0:314e) EmptyFunc2:: ; 3156 (0:3156) ret -; stores hl in [W_TRAINERHEADERPTR] +; stores hl in [wTrainerHeaderPtr] StoreTrainerHeaderPointer:: ; 3157 (0:3157) ld a, h - ld [W_TRAINERHEADERPTR], a + ld [wTrainerHeaderPtr], a ld a, l - ld [W_TRAINERHEADERPTR+1], a + ld [wTrainerHeaderPtr+1], a ret ; executes the current map script from the function pointer array provided in hl. @@ -2219,16 +2219,16 @@ ExecuteCurMapScriptInTable:: ; 3160 (0:3160) pop hl pop af push hl - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 bit 4, [hl] res 4, [hl] jr z, .useProvidedIndex ; test if map script index was overridden manually - ld a, [W_CURMAPSCRIPT] + ld a, [wCurMapScript] .useProvidedIndex pop hl - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a call CallFunctionInTable - ld a, [W_CURMAPSCRIPT] + ld a, [wCurMapScript] ret LoadGymLeaderAndCityName:: ; 317f (0:317f) @@ -2241,7 +2241,7 @@ LoadGymLeaderAndCityName:: ; 317f (0:317f) ld bc, NAME_LENGTH jp CopyData ; load gym leader name -; reads specific information from trainer header (pointed to at W_TRAINERHEADERPTR) +; reads specific information from trainer header (pointed to at wTrainerHeaderPtr) ; a: offset in header data ; 0 -> flag's bit (into wTrainerHeaderFlagBit) ; 2 -> flag's byte ptr (into hl) @@ -2253,7 +2253,7 @@ ReadTrainerHeaderInfo:: ; 3193 (0:3193) push af ld d, $0 ld e, a - ld hl, W_TRAINERHEADERPTR + ld hl, wTrainerHeaderPtr ld a, [hli] ld l, [hl] ld h, a @@ -2317,14 +2317,14 @@ TalkToTrainer:: ; 31cc (0:31cc) call ReadTrainerHeaderInfo ; read end battle text pop de call SaveEndBattleTextPointers - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 4, [hl] ; activate map script index override (index is set below) ld hl, wFlags_0xcd60 bit 0, [hl] ; test if player is already engaging the trainer (because the trainer saw the player) ret nz ; if the player talked to the trainer of his own volition call EngageMapTrainer - ld hl, W_CURMAPSCRIPT + ld hl, wCurMapScript inc [hl] ; increment map script index before StartTrainerBattle increments it again (next script function is usually EndTrainerBattle) jp StartTrainerBattle @@ -2339,7 +2339,7 @@ CheckFightingMapTrainers:: ; 3219 (0:3219) ld [wTrainerHeaderFlagBit], a ret .trainerEngaging - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 3, [hl] ld [wEmotionBubbleSpriteIndex], a xor a ; EXCLAMATION_BUBBLE @@ -2350,7 +2350,7 @@ CheckFightingMapTrainers:: ; 3219 (0:3219) xor a ld [hJoyHeld], a call TrainerWalkUpToPlayer_Bank0 - ld hl, W_CURMAPSCRIPT + ld hl, wCurMapScript inc [hl] ; increment map script index (next script function is usually DisplayEnemyTrainerTextAndStartBattle) ret @@ -2374,7 +2374,7 @@ StartTrainerBattle:: ; 325d (0:325d) set 7, [hl] ld hl, wd72e set 1, [hl] - ld hl, W_CURMAPSCRIPT + ld hl, wCurMapScript inc [hl] ; increment map script index (next script function is usually EndTrainerBattle) ret @@ -2386,7 +2386,7 @@ EndTrainerBattle:: ; 3275 (0:3275) res 7, [hl] ld hl, wFlags_0xcd60 res 0, [hl] ; player is no longer engaged by any trainer - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, ResetButtonPressedAndMapScript ld a, $2 @@ -2395,10 +2395,10 @@ EndTrainerBattle:: ; 3275 (0:3275) ld c, a ld b, FLAG_SET call TrainerFlagAction ; flag trainer as fought - ld a, [W_ENEMYMONORTRAINERCLASS] + ld a, [wEnemyMonOrTrainerClass] cp 200 jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite) - ld hl, W_MISSABLEOBJECTLIST + ld hl, wMissableObjectList ld de, $2 ld a, [wSpriteIndex] call IsInArray ; search for sprite ID @@ -2418,7 +2418,7 @@ ResetButtonPressedAndMapScript:: ; 32c1 (0:32c1) ld [hJoyHeld], a ld [hJoyPressed], a ld [hJoyReleased], a - ld [W_CURMAPSCRIPT], a ; reset battle status + ld [wCurMapScript], a ; reset battle status ret ; calls TrainerWalkUpToPlayer @@ -2428,15 +2428,15 @@ TrainerWalkUpToPlayer_Bank0:: ; 32cf (0:32cf) ; sets opponent type and mon set/lvl based on the engaging trainer data InitBattleEnemyParameters:: ; 32d7 (0:32d7) ld a, [wEngagedTrainerClass] - ld [W_CUROPPONENT], a - ld [W_ENEMYMONORTRAINERCLASS], a + ld [wCurOpponent], a + ld [wEnemyMonOrTrainerClass], a cp 200 ld a, [wEngagedTrainerSet] jr c, .noTrainer - ld [W_TRAINERNO], a + ld [wTrainerNo], a ret .noTrainer - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ret GetSpritePosition1:: ; 32ef (0:32ef) @@ -2521,7 +2521,7 @@ SaveEndBattleTextPointers:: ; 3354 (0:3354) ; loads data of some trainer on the current map and plays pre-battle music ; [wSpriteIndex]: sprite ID of trainer who is engaged EngageMapTrainer:: ; 336a (0:336a) - ld hl, W_MAPSPRITEEXTRADATA + ld hl, wMapSpriteExtraData ld d, $0 ld a, [wSpriteIndex] dec a @@ -2600,7 +2600,7 @@ PlayTrainerMusic:: ; 33e8 (0:33e8) ret z cp OPP_SONY3 ret z - ld a, [W_GYMLEADERNO] + ld a, [wGymLeaderNo] and a ret nz xor a @@ -2741,9 +2741,9 @@ SetSpriteImageIndexAfterSettingFacingDirection:: ; 34b9 (0:34b9) ; [wCoordIndex] = if there is match, the matching array index ; sets carry if the coordinates are in the array, clears carry if not ArePlayerCoordsInArray:: ; 34bf (0:34bf) - ld a,[W_YCOORD] + ld a,[wYCoord] ld b,a - ld a,[W_XCOORD] + ld a,[wXCoord] ld c,a ; fallthrough @@ -2878,7 +2878,7 @@ GetSpriteMovementByte1Pointer:: ; 354e (0:354e) ; returns the sprite movement byte 2 pointer for sprite [H_SPRITEINDEX] in hl GetSpriteMovementByte2Pointer:: ; 3558 (0:3558) push de - ld hl,W_MAPSPRITEDATA + ld hl,wMapSpriteData ld a,[H_SPRITEINDEX] dec a add a @@ -2895,7 +2895,7 @@ GetTrainerInformation:: ; 3566 (0:3566) jr nz, .linkBattle ld a, Bank(TrainerPicAndMoneyPointers) call BankswitchHome - ld a, [W_TRAINERCLASS] + ld a, [wTrainerClass] dec a ld hl, TrainerPicAndMoneyPointers ld bc, $5 @@ -3151,7 +3151,7 @@ FillMemory:: UncompressSpriteFromDE:: ; 36eb (0:36eb) ; Decompress pic at a:de. - ld hl, W_SPRITEINPUTPTR + ld hl, wSpriteInputPtr ld [hl], e inc hl ld [hl], d @@ -3537,7 +3537,7 @@ PrintLetterDelay:: ; 38d3 (0:38d3) ld a,[wLetterPrintingDelayFlags] bit 0,a jr z,.waitOneFrame - ld a,[W_OPTIONS] + ld a,[wOptions] and $f ld [H_FRAMECOUNTER],a jr .checkButtons @@ -3627,7 +3627,7 @@ CalcStat:: ; 394a (0:394a) ld a, b ld d, a push hl - ld hl, W_MONHEADER + ld hl, wMonHeader ld b, $0 add hl, bc ld a, [hl] ; read base value of stat @@ -3741,7 +3741,7 @@ CalcStat:: ; 394a (0:394a) ld [H_MULTIPLICAND+1], a xor a ld [H_MULTIPLICAND], a - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] ld [H_MULTIPLIER], a call Multiply ; ((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level ld a, [H_MULTIPLICAND] @@ -3759,7 +3759,7 @@ CalcStat:: ; 394a (0:394a) cp $1 ld a, 5 ; + 5 for non-HP stat jr nz, .notHPStat - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] ld b, a ld a, [H_MULTIPLICAND+2] add b @@ -4531,7 +4531,7 @@ ReloadMapSpriteTilePatterns:: ; 3e08 (0:3e08) res 0, [hl] push hl xor a - ld [W_SPRITESETID], a + ld [wSpriteSetID], a call DisableLCD callba InitMapSprites call EnableLCD @@ -4565,7 +4565,7 @@ GivePokemon:: ld a, b ld [wcf91], a ld a, c - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation], a jpba _GivePokemon @@ -4637,7 +4637,7 @@ PrintPredefTextID:: ; 3ef5 (0:3ef5) call DisplayTextID RestoreMapTextPointer:: ; 3f05 (0:3f05) - ld hl, W_MAPTEXTPTR + ld hl, wMapTextPtr ld a, [$ffec] ld [hli], a ld a, [$ffec + 1] @@ -4645,14 +4645,14 @@ RestoreMapTextPointer:: ; 3f05 (0:3f05) ret SetMapTextPointer:: ; 3f0f (0:3f0f) - ld a, [W_MAPTEXTPTR] + ld a, [wMapTextPtr] ld [$ffec], a - ld a, [W_MAPTEXTPTR + 1] + ld a, [wMapTextPtr + 1] ld [$ffec + 1], a ld a, l - ld [W_MAPTEXTPTR], a + ld [wMapTextPtr], a ld a, h - ld [W_MAPTEXTPTR + 1], a + ld [wMapTextPtr + 1], a ret TextPredefs:: diff --git a/home/overworld.asm b/home/overworld.asm index 9eafba04..33d66dab 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -61,7 +61,7 @@ OverworldLoopLessDelay:: ld a,[wd732] and a,1 << 4 | 1 << 3 ; fly warp or dungeon warp jp nz,HandleFlyWarpOrDungeonWarp - ld a,[W_CUROPPONENT] + ld a,[wCurOpponent] and a jp nz,.newBattle ld a,[wd730] @@ -115,17 +115,17 @@ OverworldLoopLessDelay:: jr z,.changeMap ; XXX can this code be reached? predef LoadSAV - ld a,[W_CURMAP] + ld a,[wCurMap] ld [wDestinationMap],a call SpecialWarpIn - ld a,[W_CURMAP] + ld a,[wCurMap] call SwitchToMapRomBank ; switch to the ROM bank of the current map - ld hl,W_CURMAPTILESET + ld hl,wCurMapTileset set 7,[hl] .changeMap jp EnterMap .checkForOpponent - ld a,[W_CUROPPONENT] + ld a,[wCurOpponent] and a jp nz,.newBattle jp OverworldLoop @@ -300,7 +300,7 @@ OverworldLoopLessDelay:: and a jp nz,WarpFound2 .notSafariZone - ld a,[W_ISINBATTLE] + ld a,[wIsInBattle] and a jp nz,CheckWarpsNoCollision predef ApplyOutOfBattlePoisonDamage ; also increment daycare mon exp @@ -315,21 +315,21 @@ OverworldLoopLessDelay:: .battleOccurred ld hl,wd72d res 6,[hl] - ld hl,W_FLAGS_D733 + ld hl,wFlags_D733 res 3,[hl] ld hl,wd126 set 5,[hl] set 6,[hl] xor a ld [hJoyHeld],a - ld a,[W_CURMAP] + ld a,[wCurMap] cp a,CINNABAR_GYM jr nz,.notCinnabarGym SetEvent EVENT_2A7 .notCinnabarGym ld hl,wd72e set 5,[hl] - ld a,[W_CURMAP] + ld a,[wCurMap] cp a,OAKS_LAB jp z,.noFaintCheck ; no blacking out if the player lost to the rival in Oak's lab callab AnyPartyAlive @@ -342,7 +342,7 @@ OverworldLoopLessDelay:: jp EnterMap .allPokemonFainted ld a,$ff - ld [W_ISINBATTLE],a + ld [wIsInBattle],a call RunMapScript jp HandleBlackOut @@ -367,7 +367,7 @@ BikeSpeedup:: ; 06a0 (0:06a0) ld a,[wNPCMovementScriptPointerTableNum] and a ret nz - ld a,[W_CURMAP] + ld a,[wCurMap] cp a,ROUTE_17 ; Cycling Road jr nz,.goFaster ld a,[hJoyHeld] @@ -384,9 +384,9 @@ CheckWarpsNoCollision:: ; 06b4 (0:06b4) ld a,[wNumberOfWarps] ld b,0 ld c,a - ld a,[W_YCOORD] + ld a,[wYCoord] ld d,a - ld a,[W_XCOORD] + ld a,[wXCoord] ld e,a ld hl,wWarpEntries CheckWarpsNoCollisionLoop:: ; 06cc (0:06cc) @@ -412,7 +412,7 @@ CheckWarpsNoCollisionLoop:: ; 06cc (0:06cc) pop hl jr nc,CheckWarpsNoCollisionRetry2 ; if the extra check passed - ld a,[W_FLAGS_D733] + ld a,[wFlags_D733] bit 2,a jr nz,WarpFound1 push de @@ -433,12 +433,12 @@ CheckWarpsCollision:: ; 0706 (0:0706) .loop ld a,[hli] ; Y coordinate of warp ld b,a - ld a,[W_YCOORD] + ld a,[wYCoord] cp b jr nz,.retry1 ld a,[hli] ; X coordinate of warp ld b,a - ld a,[W_XCOORD] + ld a,[wXCoord] cp b jr nz,.retry2 ld a,[hli] @@ -472,17 +472,17 @@ WarpFound2:: ; 073c (0:073c) ld a,[wNumberOfWarps] sub c ld [wWarpedFromWhichWarp],a ; save ID of used warp - ld a,[W_CURMAP] + ld a,[wCurMap] ld [wWarpedFromWhichMap],a call CheckIfInOutsideMap jr nz,.indoorMaps ; this is for handling "outside" maps that can't have the 0xFF destination map - ld a,[W_CURMAP] + ld a,[wCurMap] ld [wLastMap],a - ld a,[W_CURMAPWIDTH] + ld a,[wCurMapWidth] ld [wUnusedD366],a ; not read ld a,[hWarpDestinationMap] - ld [W_CURMAP],a + ld [wCurMap],a cp a,ROCK_TUNNEL_1 jr nz,.notRockTunnel ld a,$06 @@ -497,7 +497,7 @@ WarpFound2:: ; 073c (0:073c) cp a,$ff jr z,.goBackOutside ; if not going back to the previous map - ld [W_CURMAP],a + ld [wCurMap],a callba IsPlayerStandingOnWarpPadOrHole ld a,[wStandingOnWarpPadOrHole] dec a ; is the player on a warp pad? @@ -516,7 +516,7 @@ WarpFound2:: ; 073c (0:073c) jr .done .goBackOutside ld a,[wLastMap] - ld [W_CURMAP],a + ld [wCurMap],a call PlayMapChangeSound xor a ld [wMapPalOffset],a @@ -534,19 +534,19 @@ ContinueCheckWarpsNoCollisionLoop:: ; 07b5 (0:07b5) ; if no matching warp was found CheckMapConnections:: ; 07ba (0:07ba) .checkWestMap - ld a,[W_XCOORD] + ld a,[wXCoord] cp a,$ff jr nz,.checkEastMap - ld a,[W_MAPCONN3PTR] - ld [W_CURMAP],a + ld a,[wMapConn3Ptr] + ld [wCurMap],a ld a,[wWestConnectedMapXAlignment] ; new X coordinate upon entering west map - ld [W_XCOORD],a - ld a,[W_YCOORD] + ld [wXCoord],a + ld a,[wYCoord] ld c,a ld a,[wWestConnectedMapYAlignment] ; Y adjustment upon entering west map add c ld c,a - ld [W_YCOORD],a + ld [wYCoord],a ld a,[wWestConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position ld l,a ld a,[wWestConnectedMapViewPointer + 1] @@ -573,16 +573,16 @@ CheckMapConnections:: ; 07ba (0:07ba) ld a,[wCurrentMapWidth2] ; map width cp b jr nz,.checkNorthMap - ld a,[W_MAPCONN4PTR] - ld [W_CURMAP],a + ld a,[wMapConn4Ptr] + ld [wCurMap],a ld a,[wEastConnectedMapXAlignment] ; new X coordinate upon entering east map - ld [W_XCOORD],a - ld a,[W_YCOORD] + ld [wXCoord],a + ld a,[wYCoord] ld c,a ld a,[wEastConnectedMapYAlignment] ; Y adjustment upon entering east map add c ld c,a - ld [W_YCOORD],a + ld [wYCoord],a ld a,[wEastConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position ld l,a ld a,[wEastConnectedMapViewPointer + 1] @@ -605,19 +605,19 @@ CheckMapConnections:: ; 07ba (0:07ba) ld [wCurrentTileBlockMapViewPointer + 1],a jp .loadNewMap .checkNorthMap - ld a,[W_YCOORD] + ld a,[wYCoord] cp a,$ff jr nz,.checkSouthMap - ld a,[W_MAPCONN1PTR] - ld [W_CURMAP],a + ld a,[wMapConn1Ptr] + ld [wCurMap],a ld a,[wNorthConnectedMapYAlignment] ; new Y coordinate upon entering north map - ld [W_YCOORD],a - ld a,[W_XCOORD] + ld [wYCoord],a + ld a,[wXCoord] ld c,a ld a,[wNorthConnectedMapXAlignment] ; X adjustment upon entering north map add c ld c,a - ld [W_XCOORD],a + ld [wXCoord],a ld a,[wNorthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position ld l,a ld a,[wNorthConnectedMapViewPointer + 1] @@ -635,16 +635,16 @@ CheckMapConnections:: ; 07ba (0:07ba) ld a,[wCurrentMapHeight2] cp b jr nz,.didNotEnterConnectedMap - ld a,[W_MAPCONN2PTR] - ld [W_CURMAP],a + ld a,[wMapConn2Ptr] + ld [wCurMap],a ld a,[wSouthConnectedMapYAlignment] ; new Y coordinate upon entering south map - ld [W_YCOORD],a - ld a,[W_XCOORD] + ld [wYCoord],a + ld a,[wXCoord] ld c,a ld a,[wSouthConnectedMapXAlignment] ; X adjustment upon entering south map add c ld c,a - ld [W_XCOORD],a + ld [wXCoord],a ld a,[wSouthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position ld l,a ld a,[wSouthConnectedMapViewPointer + 1] @@ -687,7 +687,7 @@ PlayMapChangeSound:: ; 08c9 (0:08c9) CheckIfInOutsideMap:: ; 08e1 (0:08e1) ; If the player is in an outside map (a town or route), set the z flag - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] and a ; most towns/routes have tileset 0 (OVERWORLD) ret z cp PLATEAU ; Route 23 / Indigo Plateau @@ -700,7 +700,7 @@ CheckIfInOutsideMap:: ; 08e1 (0:08e1) ; "function 2" passes when the the tile in front of the player is among a certain set ; sets carry if the check passes, otherwise clears carry ExtraWarpCheck:: ; 08e9 (0:08e9) - ld a, [W_CURMAP] + ld a, [wCurMap] cp SS_ANNE_3 jr z, .useFunction1 cp ROCKET_HIDEOUT_1 @@ -711,7 +711,7 @@ ExtraWarpCheck:: ; 08e9 (0:08e9) jr z, .useFunction2 cp ROCK_TUNNEL_1 jr z, .useFunction2 - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] and a ; outside tileset (OVERWORLD) jr z, .useFunction2 cp SHIP ; S.S. Anne tileset @@ -770,7 +770,7 @@ HandleFlyWarpOrDungeonWarp:: xor a ld [wBattleResult], a ld [wWalkBikeSurfState], a - ld [W_ISINBATTLE], a + ld [wIsInBattle], a ld [wMapPalOffset], a ld hl, wd732 set 2, [hl] ; fly warp or dungeon warp @@ -828,13 +828,13 @@ IsBikeRidingAllowed:: ; or maps with tilesets in BikeRidingTilesets. ; Return carry if biking is allowed. - ld a, [W_CURMAP] + ld a, [wCurMap] cp ROUTE_23 jr z, .allowed cp INDIGO_PLATEAU jr z, .allowed - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] ld b, a ld hl, BikeRidingTilesets .loop @@ -854,13 +854,13 @@ INCLUDE "data/bike_riding_tilesets.asm" ; load the tile pattern data of the current tileset into VRAM LoadTilesetTilePatternData:: ; 09e8 (0:09e8) - ld a,[W_TILESETGFXPTR] + ld a,[wTileSetGFXPtr] ld l,a - ld a,[W_TILESETGFXPTR + 1] + ld a,[wTileSetGFXPtr + 1] ld h,a ld de,vTileset ld bc,$600 - ld a,[W_TILESETBANK] + ld a,[wTileSetBank] jp FarCopyData2 ; this loads the current maps complete tile map (which references blocks, not individual tiles) to C6E8 @@ -881,7 +881,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ; load tile map of current map (made of tile block IDs) ; a 3-byte border at the edges of the map is kept so that there is space for map connections ld hl,wOverworldMap - ld a,[W_CURMAPWIDTH] + ld a,[wCurMapWidth] ld [hMapWidth],a add a,MAP_BORDER * 2 ; east and west ld [hMapStride],a ; map width + border @@ -893,11 +893,11 @@ LoadTileBlockMap:: ; 09fc (0:09fc) add hl,bc ld c,MAP_BORDER add hl,bc ; this puts us past the (west) border - ld a,[W_MAPDATAPTR] ; tile map pointer + ld a,[wMapDataPtr] ; tile map pointer ld e,a - ld a,[W_MAPDATAPTR + 1] + ld a,[wMapDataPtr + 1] ld d,a ; de = tile map pointer - ld a,[W_CURMAPHEIGHT] + ld a,[wCurMapHeight] ld b,a .rowLoop ; copy one row each iteration push hl @@ -920,7 +920,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) dec b jr nz,.rowLoop .northConnection - ld a,[W_MAPCONN1PTR] + ld a,[wMapConn1Ptr] cp a,$ff jr z,.southConnection call SwitchToMapRomBank @@ -938,7 +938,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ld [hNorthSouthConnectedMapWidth],a call LoadNorthSouthConnectionsTileMap .southConnection - ld a,[W_MAPCONN2PTR] + ld a,[wMapConn2Ptr] cp a,$ff jr z,.westConnection call SwitchToMapRomBank @@ -956,7 +956,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ld [hNorthSouthConnectedMapWidth],a call LoadNorthSouthConnectionsTileMap .westConnection - ld a,[W_MAPCONN3PTR] + ld a,[wMapConn3Ptr] cp a,$ff jr z,.eastConnection call SwitchToMapRomBank @@ -974,7 +974,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ld [hEastWestConnectedMapWidth],a call LoadEastWestConnectionsTileMap .eastConnection - ld a,[W_MAPCONN4PTR] + ld a,[wMapConn4Ptr] cp a,$ff jr z,.done call SwitchToMapRomBank @@ -1015,7 +1015,7 @@ LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade) jr nc,.noCarry1 inc h .noCarry1 - ld a,[W_CURMAPWIDTH] + ld a,[wCurMapWidth] add a,MAP_BORDER * 2 add e ld e,a @@ -1044,7 +1044,7 @@ LoadEastWestConnectionsTileMap:: ; 0b02 (0:0b02) jr nc,.noCarry1 inc h .noCarry1 - ld a,[W_CURMAPWIDTH] + ld a,[wCurMapWidth] add a,MAP_BORDER * 2 add e ld e,a @@ -1100,7 +1100,7 @@ IsSpriteOrSignInFrontOfPlayer:: ; 0b23 (0:0b23) ; check if the player is front of a counter in a pokemon center, pokemart, etc. and if so, extend the range at which he can talk to the NPC .extendRangeOverCounter predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player in c - ld hl,W_TILESETTALKINGOVERTILES ; list of tiles that extend talking range (counter tiles) + ld hl,wTileSetTalkingOverTiles ; list of tiles that extend talking range (counter tiles) ld b,3 ld d,$20 ; talking range in pixels (long range) .counterTilesLoop @@ -1152,7 +1152,7 @@ IsSpriteInFrontOfPlayer2:: ; 0b6d (0:0b6d) ld a,PLAYER_DIR_LEFT .doneCheckingDirection ld [wPlayerDirection],a - ld a,[W_NUMSPRITES] ; number of sprites + ld a,[wNumSprites] ; number of sprites and a ret z ; if there are sprites @@ -1242,7 +1242,7 @@ CheckTilePassable:: ; 0c10 (0:0c10) predef GetTileAndCoordsInFrontOfPlayer ; get tile in front of player ld a,[wTileInFrontOfPlayer] ; tile in front of player ld c,a - ld hl,W_TILESETCOLLISIONPTR ; pointer to list of passable tiles + ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles ld a,[hli] ld h,[hl] ld l,a ; hl now points to passable tiles @@ -1284,7 +1284,7 @@ CheckForTilePairCollisions:: ; 0c4a (0:0c4a) ld a,[wTileInFrontOfPlayer] ld c,a .tilePairCollisionLoop - ld a,[W_CURMAPTILESET] ; tileset number + ld a,[wCurMapTileset] ; tileset number ld b,a ld a,[hli] cp a,$ff @@ -1354,7 +1354,7 @@ TilePairCollisionsWater:: ; 0ca0 (0:0ca0) LoadCurrentMapView:: ; 0caa (0:0caa) ld a,[H_LOADEDROMBANK] push af - ld a,[W_TILESETBANK] ; tile data ROM bank + ld a,[wTileSetBank] ; tile data ROM bank ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a ; switch to ROM bank that contains tile data ld a,[wCurrentTileBlockMapViewPointer] ; address of upper left corner of current map view @@ -1386,7 +1386,7 @@ LoadCurrentMapView:: ; 0caa (0:0caa) jr nz,.rowInnerLoop ; update tile block map pointer to next row's address pop de - ld a,[W_CURMAPWIDTH] + ld a,[wCurMapWidth] add a,MAP_BORDER * 2 add e ld e,a @@ -1406,13 +1406,13 @@ LoadCurrentMapView:: ; 0caa (0:0caa) ld hl,wTileMapBackup ld bc,$0000 .adjustForYCoordWithinTileBlock - ld a,[W_YBLOCKCOORD] + ld a,[wYBlockCoord] and a jr z,.adjustForXCoordWithinTileBlock ld bc,$0030 add hl,bc .adjustForXCoordWithinTileBlock - ld a,[W_XBLOCKCOORD] + ld a,[wXBlockCoord] and a jr z,.copyToVisibleAreaBuffer ld bc,$0002 @@ -1450,12 +1450,12 @@ AdvancePlayerSprite:: ; 0d27 (0:0d27) dec [hl] jr nz,.afterUpdateMapCoords ; if it's the end of the animation, update the player's map coordinates - ld a,[W_YCOORD] + ld a,[wYCoord] add b - ld [W_YCOORD],a - ld a,[W_XCOORD] + ld [wYCoord],a + ld a,[wXCoord] add c - ld [W_XCOORD],a + ld [wXCoord],a .afterUpdateMapCoords ld a,[wWalkCounter] ; walking animation counter cp a,$07 @@ -1522,7 +1522,7 @@ AdvancePlayerSprite:: ; 0d27 (0:0d27) and a jr z,.pointlessJump ; mistake? .pointlessJump - ld hl,W_XBLOCKCOORD + ld hl,wXBlockCoord ld a,[hl] add c ld [hl],a @@ -1548,7 +1548,7 @@ AdvancePlayerSprite:: ; 0d27 (0:0d27) call MoveTileBlockMapPointerWest jr .updateMapView .adjustYCoordWithinBlock - ld hl,W_YBLOCKCOORD + ld hl,wYBlockCoord ld a,[hl] add b ld [hl],a @@ -1560,7 +1560,7 @@ AdvancePlayerSprite:: ; 0d27 (0:0d27) ld hl,wYOffsetSinceLastSpecialWarp inc [hl] ld de,wCurrentTileBlockMapViewPointer - ld a,[W_CURMAPWIDTH] + ld a,[wCurMapWidth] call MoveTileBlockMapPointerSouth jr .updateMapView .checkForMoveToNorthBlock @@ -1572,7 +1572,7 @@ AdvancePlayerSprite:: ; 0d27 (0:0d27) ld hl,wYOffsetSinceLastSpecialWarp dec [hl] ld de,wCurrentTileBlockMapViewPointer - ld a,[W_CURMAPWIDTH] + ld a,[wCurMapWidth] call MoveTileBlockMapPointerNorth .updateMapView call LoadCurrentMapView @@ -1616,7 +1616,7 @@ AdvancePlayerSprite:: ; 0d27 (0:0d27) ; shift all the sprites in the direction opposite of the player's motion ; so that the player appears to move relative to them ld hl,wSpriteStateData1 + $14 - ld a,[W_NUMSPRITES] ; number of sprites + ld a,[wNumSprites] ; number of sprites and a ; are there any sprites? jr z,.done ld e,a @@ -1784,9 +1784,9 @@ ScheduleWestColumnRedraw:: ; 0f08 (0:0f08) ; Input: c = tile block ID, hl = destination address DrawTileBlock:: ; 0f1d (0:0f1d) push hl - ld a,[W_TILESETBLOCKSPTR] ; pointer to tiles + ld a,[wTileSetBlocksPtr] ; pointer to tiles ld l,a - ld a,[W_TILESETBLOCKSPTR + 1] + ld a,[wTileSetBlocksPtr + 1] ld h,a ld a,c swap a @@ -1829,10 +1829,10 @@ JoypadOverworld:: ; 0f4d (0:0f4d) ld [wSpriteStateData1 + 5],a call RunMapScript call Joypad - ld a,[W_FLAGS_D733] + ld a,[wFlags_D733] bit 3,a ; check if a trainer wants a challenge jr nz,.notForcedDownwards - ld a,[W_CURMAP] + ld a,[wCurMap] cp a,ROUTE_17 ; Cycling Road jr nz,.notForcedDownwards ld a,[hJoyHeld] @@ -1915,7 +1915,7 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7) jr z,.noCollision ; keep surfing ; check if the [land] tile in front of the player is passable .checkIfNextTileIsPassable - ld hl,W_TILESETCOLLISIONPTR ; pointer to list of passable tiles + ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles ld a,[hli] ld h,[hl] ld l,a @@ -1946,7 +1946,7 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7) call PlayDefaultMusic jr .noCollision .checkIfVermilionDockTileset - ld a, [W_CURMAPTILESET] ; tileset + ld a, [wCurMapTileset] ; tileset cp SHIP_PORT ; Vermilion Dock tileset jr nz, .noCollision ; keep surfing if it's not the boarding platform tile jr .stopSurfing ; if it is the boarding platform tile, stop surfing @@ -1966,9 +1966,9 @@ RunMapScript:: ; 101b (0:101b) pop de pop hl call RunNPCMovementScript - ld a,[W_CURMAP] ; current map number + ld a,[wCurMap] ; current map number call SwitchToMapRomBank ; change to the ROM bank the map's data is in - ld hl,W_MAPSCRIPTPTR + ld hl,wMapScriptPtr ld a,[hli] ld h,[hl] ld l,a @@ -2012,19 +2012,19 @@ LoadPlayerSpriteGraphicsCommon:: ; 1063 (0:1063) ; function to load data from the map header LoadMapHeader:: ; 107c (0:107c) callba MarkTownVisitedAndLoadMissableObjects - ld a,[W_CURMAPTILESET] + ld a,[wCurMapTileset] ld [wUnusedD119],a - ld a,[W_CURMAP] + ld a,[wCurMap] call SwitchToMapRomBank - ld a,[W_CURMAPTILESET] + ld a,[wCurMapTileset] ld b,a res 7,a - ld [W_CURMAPTILESET],a + ld [wCurMapTileset],a ld [hPreviousTileset],a bit 7,b ret nz ld hl,MapHeaderPointers - ld a,[W_CURMAP] + ld a,[wCurMap] sla a jr nc,.noCarry1 inc h @@ -2038,7 +2038,7 @@ LoadMapHeader:: ; 107c (0:107c) ld h,[hl] ld l,a ; hl = base of map header ; copy the first 10 bytes (the fixed area) of the map data to D367-D370 - ld de,W_CURMAPTILESET + ld de,wCurMapTileset ld c,$0a .copyFixedHeaderLoop ld a,[hli] @@ -2048,32 +2048,32 @@ LoadMapHeader:: ; 107c (0:107c) jr nz,.copyFixedHeaderLoop ; initialize all the connected maps to disabled at first, before loading the actual values ld a,$ff - ld [W_MAPCONN1PTR],a - ld [W_MAPCONN2PTR],a - ld [W_MAPCONN3PTR],a - ld [W_MAPCONN4PTR],a + ld [wMapConn1Ptr],a + ld [wMapConn2Ptr],a + ld [wMapConn3Ptr],a + ld [wMapConn4Ptr],a ; copy connection data (if any) to WRAM - ld a,[W_MAPCONNECTIONS] + ld a,[wMapConnections] ld b,a .checkNorth bit 3,b jr z,.checkSouth - ld de,W_MAPCONN1PTR + ld de,wMapConn1Ptr call CopyMapConnectionHeader .checkSouth bit 2,b jr z,.checkWest - ld de,W_MAPCONN2PTR + ld de,wMapConn2Ptr call CopyMapConnectionHeader .checkWest bit 1,b jr z,.checkEast - ld de,W_MAPCONN3PTR + ld de,wMapConn3Ptr call CopyMapConnectionHeader .checkEast bit 0,b jr z,.getObjectDataPointer - ld de,W_MAPCONN4PTR + ld de,wMapConn4Ptr call CopyMapConnectionHeader .getObjectDataPointer ld a,[hli] @@ -2144,7 +2144,7 @@ LoadMapHeader:: ; 107c (0:107c) bit 5,a ; did a battle happen immediately before this? jp nz,.finishUp ; if so, skip this because battles don't destroy this data ld a,[hli] - ld [W_NUMSPRITES],a ; save the number of sprites + ld [wNumSprites],a ; save the number of sprites push hl ; zero C110-C1FF and C210-C2FF ld hl,wSpriteStateData1 + $10 @@ -2168,7 +2168,7 @@ LoadMapHeader:: ; 107c (0:107c) jr nz,.disableSpriteEntriesLoop pop hl ld de,wSpriteStateData1 + $10 - ld a,[W_NUMSPRITES] ; number of sprites + ld a,[wNumSprites] ; number of sprites and a ; are there any sprites? jp z,.finishUp ; if there are no sprites, skip the rest ld b,a @@ -2195,7 +2195,7 @@ LoadMapHeader:: ; 107c (0:107c) push bc push hl ld b,$00 - ld hl,W_MAPSPRITEDATA + ld hl,wMapSpriteData add hl,bc ld a,[hLoadSpriteTemp1] ld [hli],a ; store movement byte 2 in byte 0 of sprite entry @@ -2218,7 +2218,7 @@ LoadMapHeader:: ; 107c (0:107c) ld a,[hli] ld [hLoadSpriteTemp2],a ; save trainer number (within class) push hl - ld hl,W_MAPSPRITEEXTRADATA + ld hl,wMapSpriteExtraData add hl,bc ld a,[hLoadSpriteTemp1] ld [hli],a ; store trainer class in byte 0 of the entry @@ -2230,7 +2230,7 @@ LoadMapHeader:: ; 107c (0:107c) ld a,[hli] ld [hLoadSpriteTemp1],a ; save item number push hl - ld hl,W_MAPSPRITEEXTRADATA + ld hl,wMapSpriteExtraData add hl,bc ld a,[hLoadSpriteTemp1] ld [hli],a ; store item number in byte 0 of the entry @@ -2240,7 +2240,7 @@ LoadMapHeader:: ; 107c (0:107c) jr .nextSprite .regularSprite push hl - ld hl,W_MAPSPRITEEXTRADATA + ld hl,wMapSpriteExtraData add hl,bc ; zero both bytes, since regular sprites don't use this extra space xor a @@ -2261,13 +2261,13 @@ LoadMapHeader:: ; 107c (0:107c) predef LoadTilesetHeader callab LoadWildData pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose) - ld a,[W_CURMAPHEIGHT] ; map height in 4x4 tile blocks + ld a,[wCurMapHeight] ; map height in 4x4 tile blocks add a ; double it ld [wCurrentMapHeight2],a ; store map height in 2x2 tile blocks - ld a,[W_CURMAPWIDTH] ; map width in 4x4 tile blocks + ld a,[wCurMapWidth] ; map width in 4x4 tile blocks add a ; double it ld [wCurrentMapWidth2],a ; map width in 2x2 tile blocks - ld a,[W_CURMAP] + ld a,[wCurMap] ld c,a ld b,$00 ld a,[H_LOADEDROMBANK] @@ -2313,7 +2313,7 @@ LoadMapData:: ; 1241 (0:1241) ld [wWalkCounter],a ld [wUnusedD119],a ld [wWalkBikeSurfStateCopy],a - ld [W_SPRITESETID],a + ld [wSpriteSetID],a call LoadTextBoxTilePatterns call LoadMapHeader callba InitMapSprites ; load tile pattern data for sprites @@ -2349,7 +2349,7 @@ LoadMapData:: ; 1241 (0:1241) ld a,[wd732] and a,1 << 4 | 1 << 3 ; fly warp or dungeon warp jr nz,.restoreRomBank - ld a,[W_FLAGS_D733] + ld a,[wFlags_D733] bit 1,a jr nz,.restoreRomBank call UpdateMusic6Times diff --git a/home/pic.asm b/home/pic.asm index 4bc7b31c..81629055 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -1,5 +1,5 @@ ; bankswitches and runs _UncompressSpriteData -; bank is given in a, sprite input stream is pointed to in W_SPRITEINPUTPTR +; bank is given in a, sprite input stream is pointed to in wSpriteInputPtr UncompressSpriteData:: ; 24fd (0:24fd) ld b, a ld a, [H_LOADEDROMBANK] @@ -25,29 +25,29 @@ _UncompressSpriteData:: ; 251a (0:251a) xor a call FillMemory ; clear sprite buffer 1 and 2 ld a, $1 - ld [W_SPRITEINPUTBITCOUNTER], a + ld [wSpriteInputBitCounter], a ld a, $3 - ld [W_SPRITEOUTPUTBITOFFSET], a + ld [wSpriteOutputBitOffset], a xor a - ld [W_SPRITECURPOSX], a - ld [W_SPRITECURPOSY], a - ld [W_SPRITELOADFLAGS], a + ld [wSpriteCurPosX], a + ld [wSpriteCurPosY], a + ld [wSpriteLoadFlags], a call ReadNextInputByte ; first byte of input determines sprite width (high nybble) and height (low nybble) in tiles (8x8 pixels) ld b, a and $f add a add a add a - ld [W_SPRITEHEIGHT], a + ld [wSpriteHeight], a ld a, b swap a and $f add a add a add a - ld [W_SPRITEWITDH], a + ld [wSpriteWidth], a call ReadNextInputBit - ld [W_SPRITELOADFLAGS], a ; initialite bit1 to 0 and bit0 to the first input bit + ld [wSpriteLoadFlags], a ; initialite bit1 to 0 and bit0 to the first input bit ; this will load two chunks of data to S_SPRITEBUFFER1 and S_SPRITEBUFFER2 ; bit 0 decides in which one the first chunk is placed ; fall through @@ -57,13 +57,13 @@ _UncompressSpriteData:: ; 251a (0:251a) ; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack UncompressSpriteDataLoop:: ; 2556 (0:2556) ld hl, S_SPRITEBUFFER1 - ld a, [W_SPRITELOADFLAGS] + ld a, [wSpriteLoadFlags] bit 0, a jr z, .useSpriteBuffer1 ; check which buffer to use ld hl, S_SPRITEBUFFER2 .useSpriteBuffer1 call StoreSpriteOutputPointer - ld a, [W_SPRITELOADFLAGS] + ld a, [wSpriteLoadFlags] bit 1, a jr z, .startDecompression ; check if last iteration call ReadNextInputBit ; if last chunk, read 1-2 bit unpacking mode @@ -72,7 +72,7 @@ UncompressSpriteDataLoop:: ; 2556 (0:2556) call ReadNextInputBit ; 1 0 -> mode 1 inc a ; 1 1 -> mode 2 .unpackingMode0 - ld [W_SPRITEUNPACKMODE], a + ld [wSpriteUnpackMode], a .startDecompression call ReadNextInputBit and a @@ -146,69 +146,69 @@ UncompressSpriteDataLoop:: ; 2556 (0:2556) ; also cancels the calling function if the all output is done (by removing the return pointer from stack) ; and calls postprocessing functions according to the unpack mode MoveToNextBufferPosition:: ; 25d8 (0:25d8) - ld a, [W_SPRITEHEIGHT] + ld a, [wSpriteHeight] ld b, a - ld a, [W_SPRITECURPOSY] + ld a, [wSpriteCurPosY] inc a cp b jr z, .curColumnDone - ld [W_SPRITECURPOSY], a - ld a, [W_SPRITEOUTPUTPTR] + ld [wSpriteCurPosY], a + ld a, [wSpriteOutputPtr] inc a - ld [W_SPRITEOUTPUTPTR], a + ld [wSpriteOutputPtr], a ret nz - ld a, [W_SPRITEOUTPUTPTR+1] + ld a, [wSpriteOutputPtr+1] inc a - ld [W_SPRITEOUTPUTPTR+1], a + ld [wSpriteOutputPtr+1], a ret .curColumnDone xor a - ld [W_SPRITECURPOSY], a - ld a, [W_SPRITEOUTPUTBITOFFSET] + ld [wSpriteCurPosY], a + ld a, [wSpriteOutputBitOffset] and a jr z, .bitOffsetsDone dec a - ld [W_SPRITEOUTPUTBITOFFSET], a - ld hl, W_SPRITEOUTPUTPTRCACHED + ld [wSpriteOutputBitOffset], a + ld hl, wSpriteOutputPtrCached ld a, [hli] - ld [W_SPRITEOUTPUTPTR], a + ld [wSpriteOutputPtr], a ld a, [hl] - ld [W_SPRITEOUTPUTPTR+1], a + ld [wSpriteOutputPtr+1], a ret .bitOffsetsDone ld a, $3 - ld [W_SPRITEOUTPUTBITOFFSET], a - ld a, [W_SPRITECURPOSX] + ld [wSpriteOutputBitOffset], a + ld a, [wSpriteCurPosX] add $8 - ld [W_SPRITECURPOSX], a + ld [wSpriteCurPosX], a ld b, a - ld a, [W_SPRITEWITDH] + ld a, [wSpriteWidth] cp b jr z, .allColumnsDone - ld a, [W_SPRITEOUTPUTPTR] + ld a, [wSpriteOutputPtr] ld l, a - ld a, [W_SPRITEOUTPUTPTR+1] + ld a, [wSpriteOutputPtr+1] ld h, a inc hl jp StoreSpriteOutputPointer .allColumnsDone pop hl xor a - ld [W_SPRITECURPOSX], a - ld a, [W_SPRITELOADFLAGS] + ld [wSpriteCurPosX], a + ld a, [wSpriteLoadFlags] bit 1, a jr nz, .done ; test if there is one more sprite to go xor $1 set 1, a - ld [W_SPRITELOADFLAGS], a + ld [wSpriteLoadFlags], a jp UncompressSpriteDataLoop .done jp UnpackSprite -; writes 2 bits (from a) to the output buffer (pointed to from W_SPRITEOUTPUTPTR) +; writes 2 bits (from a) to the output buffer (pointed to from wSpriteOutputPtr) WriteSpriteBitsToBuffer:: ; 2649 (0:2649) ld e, a - ld a, [W_SPRITEOUTPUTBITOFFSET] + ld a, [wSpriteOutputBitOffset] and a jr z, .offset0 cp $2 @@ -224,9 +224,9 @@ WriteSpriteBitsToBuffer:: ; 2649 (0:2649) .offset2 swap e .offset0 - ld a, [W_SPRITEOUTPUTPTR] + ld a, [wSpriteOutputPtr] ld l, a - ld a, [W_SPRITEOUTPUTPTR+1] + ld a, [wSpriteOutputPtr+1] ld h, a ld a, [hl] or e @@ -235,32 +235,32 @@ WriteSpriteBitsToBuffer:: ; 2649 (0:2649) ; reads next bit from input stream and returns it in a ReadNextInputBit:: ; 2670 (0:2670) - ld a, [W_SPRITEINPUTBITCOUNTER] + ld a, [wSpriteInputBitCounter] dec a jr nz, .curByteHasMoreBitsToRead call ReadNextInputByte - ld [W_SPRITEINPUTCURBYTE], a + ld [wSpriteInputCurByte], a ld a, $8 .curByteHasMoreBitsToRead - ld [W_SPRITEINPUTBITCOUNTER], a - ld a, [W_SPRITEINPUTCURBYTE] + ld [wSpriteInputBitCounter], a + ld a, [wSpriteInputCurByte] rlca - ld [W_SPRITEINPUTCURBYTE], a + ld [wSpriteInputCurByte], a and $1 ret ; reads next byte from input stream and returns it in a ReadNextInputByte:: ; 268b (0:268b) - ld a, [W_SPRITEINPUTPTR] + ld a, [wSpriteInputPtr] ld l, a - ld a, [W_SPRITEINPUTPTR+1] + ld a, [wSpriteInputPtr+1] ld h, a ld a, [hli] ld b, a ld a, l - ld [W_SPRITEINPUTPTR], a + ld [wSpriteInputPtr], a ld a, h - ld [W_SPRITEINPUTPTR+1], a + ld [wSpriteInputPtr+1], a ld a, b ret @@ -285,7 +285,7 @@ LengthEncodingOffsetList:: ; 269f (0:269f) ; unpacks the sprite data depending on the unpack mode UnpackSprite:: ; 26bf (0:26bf) - ld a, [W_SPRITEUNPACKMODE] + ld a, [wSpriteUnpackMode] cp $2 jp z, UnpackSpriteMode2 and a @@ -299,10 +299,10 @@ UnpackSprite:: ; 26bf (0:26bf) ; input bit value 0 preserves the current bit value and input bit value 1 toggles it (starting from initial value 0). SpriteDifferentialDecode:: ; 26d4 (0:26d4) xor a - ld [W_SPRITECURPOSX], a - ld [W_SPRITECURPOSY], a + ld [wSpriteCurPosX], a + ld [wSpriteCurPosY], a call StoreSpriteOutputPointer - ld a, [W_SPRITEFLIPPED] + ld a, [wSpriteFlipped] and a jr z, .notFlipped ld hl, DecodeNybble0TableFlipped @@ -313,18 +313,18 @@ SpriteDifferentialDecode:: ; 26d4 (0:26d4) ld de, DecodeNybble1Table .storeDecodeTablesPointers ld a, l - ld [W_SPRITEDECODETABLE0PTR], a + ld [wSpriteDecodeTable0Ptr], a ld a, h - ld [W_SPRITEDECODETABLE0PTR+1], a + ld [wSpriteDecodeTable0Ptr+1], a ld a, e - ld [W_SPRITEDECODETABLE1PTR], a + ld [wSpriteDecodeTable1Ptr], a ld a, d - ld [W_SPRITEDECODETABLE1PTR+1], a + ld [wSpriteDecodeTable1Ptr+1], a ld e, $0 ; last decoded nybble, initialized to 0 .decodeNextByteLoop - ld a, [W_SPRITEOUTPUTPTR] + ld a, [wSpriteOutputPtr] ld l, a - ld a, [W_SPRITEOUTPUTPTR+1] + ld a, [wSpriteOutputPtr+1] ld h, a ld a, [hl] ld b, a @@ -338,47 +338,47 @@ SpriteDifferentialDecode:: ; 26d4 (0:26d4) call DifferentialDecodeNybble ; decode low nybble or d ld b, a - ld a, [W_SPRITEOUTPUTPTR] + ld a, [wSpriteOutputPtr] ld l, a - ld a, [W_SPRITEOUTPUTPTR+1] + ld a, [wSpriteOutputPtr+1] ld h, a ld a, b ld [hl], a ; write back decoded data - ld a, [W_SPRITEHEIGHT] + ld a, [wSpriteHeight] add l ; move on to next column jr nc, .noCarry inc h .noCarry - ld [W_SPRITEOUTPUTPTR], a + ld [wSpriteOutputPtr], a ld a, h - ld [W_SPRITEOUTPUTPTR+1], a - ld a, [W_SPRITECURPOSX] + ld [wSpriteOutputPtr+1], a + ld a, [wSpriteCurPosX] add $8 - ld [W_SPRITECURPOSX], a + ld [wSpriteCurPosX], a ld b, a - ld a, [W_SPRITEWITDH] + ld a, [wSpriteWidth] cp b jr nz, .decodeNextByteLoop ; test if current row is done xor a ld e, a - ld [W_SPRITECURPOSX], a - ld a, [W_SPRITECURPOSY] ; move on to next row + ld [wSpriteCurPosX], a + ld a, [wSpriteCurPosY] ; move on to next row inc a - ld [W_SPRITECURPOSY], a + ld [wSpriteCurPosY], a ld b, a - ld a, [W_SPRITEHEIGHT] + ld a, [wSpriteHeight] cp b jr z, .done ; test if all rows finished - ld a, [W_SPRITEOUTPUTPTRCACHED] + ld a, [wSpriteOutputPtrCached] ld l, a - ld a, [W_SPRITEOUTPUTPTRCACHED+1] + ld a, [wSpriteOutputPtrCached+1] ld h, a inc hl call StoreSpriteOutputPointer jr .decodeNextByteLoop .done xor a - ld [W_SPRITECURPOSY], a + ld [wSpriteCurPosY], a ret ; decodes the nybble stored in a. Last decoded data is assumed to be in e (needed to determine if initial value is 0 or 1) @@ -389,7 +389,7 @@ DifferentialDecodeNybble:: ; 276d (0:276d) ld c, $1 .evenNumber ld l, a - ld a, [W_SPRITEFLIPPED] + ld a, [wSpriteFlipped] and a jr z, .notFlipped ; determine if initial value is 0 or one bit 3, e ; if flipped, consider MSB of last data @@ -399,14 +399,14 @@ DifferentialDecodeNybble:: ; 276d (0:276d) .selectLookupTable ld e, l jr nz, .initialValue1 ; load the appropriate table - ld a, [W_SPRITEDECODETABLE0PTR] + ld a, [wSpriteDecodeTable0Ptr] ld l, a - ld a, [W_SPRITEDECODETABLE0PTR+1] + ld a, [wSpriteDecodeTable0Ptr+1] jr .tableLookup .initialValue1 - ld a, [W_SPRITEDECODETABLE1PTR] + ld a, [wSpriteDecodeTable1Ptr] ld l, a - ld a, [W_SPRITEDECODETABLE1PTR+1] + ld a, [wSpriteDecodeTable1Ptr+1] .tableLookup ld h, a ld a, e @@ -464,25 +464,25 @@ DecodeNybble1TableFlipped:: ; 27bf (0:27bf) ; combines the two loaded chunks with xor (the chunk loaded second is the destination). The source chunk is differeintial decoded beforehand. XorSpriteChunks:: ; 27c7 (0:27c7) xor a - ld [W_SPRITECURPOSX], a - ld [W_SPRITECURPOSY], a + ld [wSpriteCurPosX], a + ld [wSpriteCurPosY], a call ResetSpriteBufferPointers - ld a, [W_SPRITEOUTPUTPTR] ; points to buffer 1 or 2, depending on flags + ld a, [wSpriteOutputPtr] ; points to buffer 1 or 2, depending on flags ld l, a - ld a, [W_SPRITEOUTPUTPTR+1] + ld a, [wSpriteOutputPtr+1] ld h, a call SpriteDifferentialDecode ; decode buffer 1 or 2, depending on flags call ResetSpriteBufferPointers - ld a, [W_SPRITEOUTPUTPTR] ; source buffer, points to buffer 1 or 2, depending on flags + ld a, [wSpriteOutputPtr] ; source buffer, points to buffer 1 or 2, depending on flags ld l, a - ld a, [W_SPRITEOUTPUTPTR+1] + ld a, [wSpriteOutputPtr+1] ld h, a - ld a, [W_SPRITEOUTPUTPTRCACHED] ; destination buffer, points to buffer 2 or 1, depending on flags + ld a, [wSpriteOutputPtrCached] ; destination buffer, points to buffer 2 or 1, depending on flags ld e, a - ld a, [W_SPRITEOUTPUTPTRCACHED+1] + ld a, [wSpriteOutputPtrCached+1] ld d, a .xorChunksLoop - ld a, [W_SPRITEFLIPPED] + ld a, [wSpriteFlipped] and a jr z, .notFlipped push de @@ -506,24 +506,24 @@ XorSpriteChunks:: ; 27c7 (0:27c7) xor b ld [de], a inc de - ld a, [W_SPRITECURPOSY] + ld a, [wSpriteCurPosY] inc a - ld [W_SPRITECURPOSY], a ; go to next row + ld [wSpriteCurPosY], a ; go to next row ld b, a - ld a, [W_SPRITEHEIGHT] + ld a, [wSpriteHeight] cp b jr nz, .xorChunksLoop ; test if column finished xor a - ld [W_SPRITECURPOSY], a - ld a, [W_SPRITECURPOSX] + ld [wSpriteCurPosY], a + ld a, [wSpriteCurPosX] add $8 - ld [W_SPRITECURPOSX], a ; go to next column + ld [wSpriteCurPosX], a ; go to next column ld b, a - ld a, [W_SPRITEWITDH] + ld a, [wSpriteWidth] cp b jr nz, .xorChunksLoop ; test if all columns finished xor a - ld [W_SPRITECURPOSX], a + ld [wSpriteCurPosX], a ret ; reverses the bits in the nybble given in register a @@ -537,9 +537,9 @@ ReverseNybble:: ; 2837 (0:2837) ld a, [de] ret -; resets sprite buffer pointers to buffer 1 and 2, depending on W_SPRITELOADFLAGS +; resets sprite buffer pointers to buffer 1 and 2, depending on wSpriteLoadFlags ResetSpriteBufferPointers:: ; 2841 (0:2841) - ld a, [W_SPRITELOADFLAGS] + ld a, [wSpriteLoadFlags] bit 0, a jr nz, .buffer2Selected ld de, S_SPRITEBUFFER1 @@ -550,13 +550,13 @@ ResetSpriteBufferPointers:: ; 2841 (0:2841) ld hl, S_SPRITEBUFFER1 .storeBufferPointers ld a, l - ld [W_SPRITEOUTPUTPTR], a + ld [wSpriteOutputPtr], a ld a, h - ld [W_SPRITEOUTPUTPTR+1], a + ld [wSpriteOutputPtr+1], a ld a, e - ld [W_SPRITEOUTPUTPTRCACHED], a + ld [wSpriteOutputPtrCached], a ld a, d - ld [W_SPRITEOUTPUTPTRCACHED+1], a + ld [wSpriteOutputPtrCached+1], a ret ; maps each nybble to its reverse @@ -566,26 +566,26 @@ NybbleReverseTable:: ; 2867 (0:2867) ; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differeintial decoded beforehand. UnpackSpriteMode2:: ; 2877 (0:2877) call ResetSpriteBufferPointers - ld a, [W_SPRITEFLIPPED] + ld a, [wSpriteFlipped] push af xor a - ld [W_SPRITEFLIPPED], a ; temporarily clear flipped flag for decoding the destination chunk - ld a, [W_SPRITEOUTPUTPTRCACHED] + ld [wSpriteFlipped], a ; temporarily clear flipped flag for decoding the destination chunk + ld a, [wSpriteOutputPtrCached] ld l, a - ld a, [W_SPRITEOUTPUTPTRCACHED+1] + ld a, [wSpriteOutputPtrCached+1] ld h, a call SpriteDifferentialDecode call ResetSpriteBufferPointers pop af - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a jp XorSpriteChunks ; stores hl into the output pointers StoreSpriteOutputPointer:: ; 2897 (0:2897) ld a, l - ld [W_SPRITEOUTPUTPTR], a - ld [W_SPRITEOUTPUTPTRCACHED], a + ld [wSpriteOutputPtr], a + ld [wSpriteOutputPtrCached], a ld a, h - ld [W_SPRITEOUTPUTPTR+1], a - ld [W_SPRITEOUTPUTPTRCACHED+1], a + ld [wSpriteOutputPtr+1], a + ld [wSpriteOutputPtrCached+1], a ret diff --git a/home/text.asm b/home/text.asm index 238af447..a9e7cd60 100644 --- a/home/text.asm +++ b/home/text.asm @@ -146,7 +146,7 @@ Char52:: ; 0x19f9 player’s name Char53:: ; 19ff (0:19ff) ; rival’s name push de - ld de,W_RIVALNAME + ld de,wRivalName jr FinishDTE Char5D:: ; 1a05 (0:1a05) ; TRAINER diff --git a/main.asm b/main.asm index 300afffd..fb7e2045 100755 --- a/main.asm +++ b/main.asm @@ -24,7 +24,7 @@ ResetStatusAndHalveMoneyOnBlackout:: xor a ld [wBattleResult], a ld [wWalkBikeSurfState], a - ld [W_ISINBATTLE], a + ld [wIsInBattle], a ld [wMapPalOffset], a ld [wNPCMovementScriptFunctionNum], a ld [hJoyHeld], a @@ -86,7 +86,7 @@ LoadMonData_: ; 2: boxmon ; 3: daycaremon ; Return monster id at wcf91 and its data at wLoadedMon. -; Also load base stats at W_MONHEADER for convenience. +; Also load base stats at wMonHeader for convenience. ld a, [wDayCareMonSpecies] ld [wcf91], a @@ -161,7 +161,7 @@ PrintWaitingText: coord hl, 3, 10 ld b, $1 ld c, $b - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a jr z, .asm_4c17 call TextBoxBorder @@ -545,9 +545,9 @@ TestBattle: ; Don't mess around ; with obedience. ld a, %10000000 ; EARTHBADGE - ld [W_OBTAINEDBADGES], a + ld [wObtainedBadges], a - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set BIT_TEST_BATTLE, [hl] ; Reset the party. @@ -562,16 +562,16 @@ TestBattle: ld a, RHYDON ld [wcf91], a ld a, 20 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a xor a ld [wMonDataLocation], a - ld [W_CURMAP], a + ld [wCurMap], a call AddPartyMon ; Fight against a ; level 20 Rhydon. ld a, RHYDON - ld [W_CUROPPONENT], a + ld [wCurOpponent], a predef InitOpponent @@ -655,7 +655,7 @@ LoadSpecialWarpData: ; 62ff (1:62ff) jr nz, .notFirstMap ld hl, FirstMapSpec .copyWarpData - ld de, W_CURMAP + ld de, wCurMap ld c, $7 .copyWarpDataLoop ld a, [hli] @@ -664,7 +664,7 @@ LoadSpecialWarpData: ; 62ff (1:62ff) dec c jr nz, .copyWarpDataLoop ld a, [hli] - ld [W_CURMAPTILESET], a + ld [wCurMapTileset], a xor a jr .done .notFirstMap @@ -683,7 +683,7 @@ LoadSpecialWarpData: ; 62ff (1:62ff) res 4, [hl] ld a, [wDungeonWarpDestinationMap] ld b, a - ld [W_CURMAP], a + ld [wCurMap], a ld a, [wWhichDungeonWarp] ld c, a ld hl, DungeonWarpList @@ -713,7 +713,7 @@ LoadSpecialWarpData: ; 62ff (1:62ff) ld a, [wDestinationMap] .usedFlyWarp ld b, a - ld [W_CURMAP], a + ld [wCurMap], a ld hl, FlyWarpDataPtr .flyWarpDataPtrLoop ld a, [hli] @@ -737,7 +737,7 @@ LoadSpecialWarpData: ; 62ff (1:62ff) dec c jr nz, .copyWarpDataLoop2 xor a ; OVERWORLD - ld [W_CURMAPTILESET], a + ld [wCurMapTileset], a .done ld [wYOffsetSinceLastSpecialWarp], a ld [wXOffsetSinceLastSpecialWarp], a @@ -765,7 +765,7 @@ SetIshiharaTeam: ; 64ca (1:64ca) ld [wcf91], a inc de ld a, [de] - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a inc de call AddPartyMon jr .loop @@ -966,7 +966,7 @@ SetLastBlackoutMap: push hl ld hl, SafariZoneRestHouses - ld a, [W_CURMAP] + ld a, [wCurMap] ld b, a .loop ld a, [hli] @@ -1931,7 +1931,7 @@ _RemovePokemon: ; 7b68 (1:7b68) ld a, [wRemoveMonFromBox] and a jr z, .asm_7b74 - ld hl, W_NUMINBOX + ld hl, wNumInBox .asm_7b74 ld a, [hl] dec a @@ -2058,7 +2058,7 @@ ClearVariablesAfterLoadingMapData: ; c335 (3:4335) xor a ld [H_AUTOBGTRANSFERENABLED], a ld [wStepCounter], a - ld [W_LONEATTACKNO], a + ld [wLoneAttackNo], a ld [hJoyPressed], a ld [hJoyReleased], a ld [hJoyHeld], a @@ -2080,11 +2080,11 @@ IsPlayerStandingOnWarp: ; c35f (3:435f) ld c, a ld hl, wWarpEntries .loop - ld a, [W_YCOORD] + ld a, [wYCoord] cp [hl] jr nz, .nextWarp1 inc hl - ld a, [W_XCOORD] + ld a, [wXCoord] cp [hl] jr nz, .nextWarp2 inc hl @@ -2110,11 +2110,11 @@ CheckForceBikeOrSurf: ; c38b (3:438b) bit 5, [hl] ret nz ld hl, ForcedBikeOrSurfMaps - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a - ld a, [W_CURMAP] + ld a, [wCurMap] ld d, a .loop ld a, [hli] @@ -2128,15 +2128,15 @@ CheckForceBikeOrSurf: ; c38b (3:438b) ld a, [hli] cp c ;compare x-coord jr nz, .loop ; incorrect x-coord, check next item - ld a, [W_CURMAP] + ld a, [wCurMap] cp SEAFOAM_ISLANDS_4 ld a, $2 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a jr z, .forceSurfing - ld a, [W_CURMAP] + ld a, [wCurMap] cp SEAFOAM_ISLANDS_5 ld a, $2 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a jr z, .forceSurfing ;force bike riding ld hl, wd732 @@ -2171,9 +2171,9 @@ IsPlayerFacingEdgeOfMap: ; c3ff (3:43ff) ld a, [hli] ld h, [hl] ld l, a - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a ld de, .asm_c41e push de @@ -2191,7 +2191,7 @@ IsPlayerFacingEdgeOfMap: ; c3ff (3:43ff) dw .facingRight .facingDown - ld a, [W_CURMAPHEIGHT] + ld a, [wCurMapHeight] add a dec a cp b @@ -2211,7 +2211,7 @@ IsPlayerFacingEdgeOfMap: ; c3ff (3:43ff) jr .resetCarry .facingRight - ld a, [W_CURMAPWIDTH] + ld a, [wCurMapWidth] add a dec a cp c @@ -2229,7 +2229,7 @@ IsWarpTileInFrontOfPlayer: ; c44e (3:444e) push de push bc call _GetTileAndCoordsInFrontOfPlayer - ld a, [W_CURMAP] + ld a, [wCurMap] cp SS_ANNE_5 jr z, .ssAnne5 ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction @@ -2284,7 +2284,7 @@ IsPlayerStandingOnDoorTileOrWarpTile: ; c49d (3:449d) push bc callba IsPlayerStandingOnDoorTile jr c, .done - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] add a ld c, a ld b, $0 @@ -2308,7 +2308,7 @@ IsPlayerStandingOnDoorTileOrWarpTile: ; c49d (3:449d) INCLUDE "data/warp_tile_ids.asm" PrintSafariZoneSteps: ; c52f (3:452f) - ld a, [W_CURMAP] + ld a, [wCurMap] cp SAFARI_ZONE_EAST ret c cp UNKNOWN_DUNGEON_2 @@ -2327,7 +2327,7 @@ PrintSafariZoneSteps: ; c52f (3:452f) coord hl, 1, 3 ld de, SafariBallText call PlaceString - ld a, [W_NUMSAFARIBALLS] + ld a, [wNumSafariBalls] cp 10 jr nc, .asm_c56d coord hl, 5, 3 @@ -2335,7 +2335,7 @@ PrintSafariZoneSteps: ; c52f (3:452f) ld [hl], a .asm_c56d coord hl, 6, 3 - ld de, W_NUMSAFARIBALLS + ld de, wNumSafariBalls lb bc, 1, 2 jp PrintNumber @@ -2349,9 +2349,9 @@ GetTileAndCoordsInFrontOfPlayer: ; c586 (3:4586) call GetPredefRegisters _GetTileAndCoordsInFrontOfPlayer: ; c589 (3:4589) - ld a, [W_YCOORD] + ld a, [wYCoord] ld d, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld e, a ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction and a ; cp SPRITE_FACING_DOWN @@ -2388,7 +2388,7 @@ _GetTileAndCoordsInFrontOfPlayer: ; c589 (3:4589) GetTileTwoStepsInFrontOfPlayer: ; c5be (3:45be) xor a ld [$ffdb], a - ld hl, W_YCOORD + ld hl, wYCoord ld a, [hli] ld d, a ld e, [hl] @@ -2435,7 +2435,7 @@ GetTileTwoStepsInFrontOfPlayer: ; c5be (3:45be) CheckForCollisionWhenPushingBoulder: ; c60b (3:460b) call GetTileTwoStepsInFrontOfPlayer - ld hl, W_TILESETCOLLISIONPTR + ld hl, wTileSetCollisionPtr ld a, [hli] ld h, [hl] ld l, a @@ -2471,7 +2471,7 @@ CheckForBoulderCollisionWithSprites: ; c636 (3:4636) ld [$ffdc], a ld a, [hl] ; map X position ld [$ffdd], a - ld a, [W_NUMSPRITES] + ld a, [wNumSprites] ld c, a ld de, $f ld hl, wSpriteStateData2 + $14 @@ -2653,7 +2653,7 @@ LoadTilesetHeader: ; c754 (3:4754) call GetPredefRegisters push hl ld d, 0 - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] add a add a ld b, a @@ -2665,7 +2665,7 @@ LoadTilesetHeader: ; c754 (3:4754) ld e, a ld hl, Tilesets add hl, de - ld de, W_TILESETBANK + ld de, wTileSetBank ld c, $b .copyTilesetHeaderLoop ld a, [hli] @@ -2678,7 +2678,7 @@ LoadTilesetHeader: ; c754 (3:4754) xor a ld [$ffd8], a pop hl - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] push hl push de ld hl, DungeonTilesets @@ -2687,7 +2687,7 @@ LoadTilesetHeader: ; c754 (3:4754) pop de pop hl jr c, .asm_c797 - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] ld b, a ld a, [hPreviousTileset] cp b @@ -2697,12 +2697,12 @@ LoadTilesetHeader: ; c754 (3:4754) cp $ff jr z, .done call LoadDestinationWarpPosition - ld a, [W_YCOORD] + ld a, [wYCoord] and $1 - ld [W_YBLOCKCOORD], a - ld a, [W_XCOORD] + ld [wYBlockCoord], a + ld a, [wXCoord] and $1 - ld [W_XBLOCKCOORD], a + ld [wXBlockCoord], a .done ret @@ -2711,7 +2711,7 @@ INCLUDE "data/dungeon_tilesets.asm" INCLUDE "data/tileset_headers.asm" IncrementDayCareMonExp: ; c8de (3:48de) - ld a, [W_DAYCARE_IN_USE] + ld a, [wDayCareInUse] and a ret z ld hl, wDayCareMonExp + 2 @@ -2760,7 +2760,7 @@ IsSurfingAllowed: ; cdc0 (3:4dc0) ld a, [wd732] bit 5, a jr nz, .forcedToRideBike - ld a, [W_CURMAP] + ld a, [wCurMap] cp SEAFOAM_ISLANDS_5 ret nz CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE @@ -2944,7 +2944,7 @@ RemoveItemFromInventory_: ; ce74 (3:4e74) LoadWildData: ; ceb8 (3:4eb8) ld hl,WildDataPointers - ld a,[W_CURMAP] + ld a,[wCurMap] ; get wild data for current map ld c,a @@ -2955,11 +2955,11 @@ LoadWildData: ; ceb8 (3:4eb8) ld h,[hl] ld l,a ; hl now points to wild data for current map ld a,[hli] - ld [W_GRASSRATE],a + ld [wGrassRate],a and a jr z,.NoGrassData ; if no grass data, skip to surfing data push hl - ld de,W_GRASSMONS ; otherwise, load grass data + ld de,wGrassMons ; otherwise, load grass data ld bc,$0014 call CopyData pop hl @@ -3000,7 +3000,7 @@ DrawBadges: ; ea03 (3:6a03) ; Alter these based on owned badges. ld de, wTempObtainedBadgesBooleans ld hl, wBadgeOrFaceTiles - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] ld b, a ld c, 8 .CheckBadge @@ -3106,7 +3106,7 @@ GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e) ReplaceTileBlock: ; ee9e (3:6e9e) call GetPredefRegisters ld hl, wOverworldMap - ld a, [W_CURMAPWIDTH] + ld a, [wCurMapWidth] add $6 ld e, a ld d, $0 @@ -3148,7 +3148,7 @@ ReplaceTileBlock: ; ee9e (3:6e9e) ret c ; return if the replaced tile block is above the map view in memory RedrawMapView: ; eedc (3:6edc) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] inc a ret z ld a, [H_AUTOBGTRANSFERENABLED] @@ -3229,16 +3229,16 @@ CompareHLWithBC: ; ef4e (3:6f4e) INCLUDE "engine/overworld/cut.asm" MarkTownVisitedAndLoadMissableObjects: ; f113 (3:7113) - ld a, [W_CURMAP] + ld a, [wCurMap] cp ROUTE_1 jr nc, .notInTown ld c, a ld b, FLAG_SET - ld hl, W_TOWNVISITEDFLAG ; mark town as visited (for flying) + ld hl, wTownVisitedFlag ; mark town as visited (for flying) predef FlagActionPredef .notInTown ld hl, MapHSPointers - ld a, [W_CURMAP] + ld a, [wCurMap] ld b, $0 ld c, a add hl, bc @@ -3271,11 +3271,11 @@ LoadMissableObjects: ; f132 (3:7132) ld [H_DIVISOR], a ld b, $2 call Divide ; divide difference by 3, resulting in the global offset (number of missable items before ours) - ld a, [W_CURMAP] + ld a, [wCurMap] ld b, a ld a, [H_DIVIDEND+3] ld c, a ; store global offset in c - ld de, W_MISSABLEOBJECTLIST + ld de, wMissableObjectList pop hl .writeMissableObjectsListLoop ld a, [hli] @@ -3298,8 +3298,8 @@ LoadMissableObjects: ; f132 (3:7132) ret InitializeMissableObjectsFlags: ; f175 (3:7175) - ld hl, W_MISSABLEOBJECTFLAGS - ld bc, wMissableObjectFlagsEnd - W_MISSABLEOBJECTFLAGS + ld hl, wMissableObjectFlags + ld bc, wMissableObjectFlagsEnd - wMissableObjectFlags xor a call FillMemory ; clear missable objects flags ld hl, MapHS00 @@ -3314,7 +3314,7 @@ InitializeMissableObjectsFlags: ; f175 (3:7175) ld a, [hl] cp Hide jr nz, .skip - ld hl, W_MISSABLEOBJECTFLAGS + ld hl, wMissableObjectFlags ld a, [wMissableObjectCounter] ld c, a ld b, FLAG_SET @@ -3332,7 +3332,7 @@ IsObjectHidden: ; f1a6 (3:71a6) ld a, [H_CURRENTSPRITEOFFSET] swap a ld b, a - ld hl, W_MISSABLEOBJECTLIST + ld hl, wMissableObjectList .loop ld a, [hli] cp $ff @@ -3342,7 +3342,7 @@ IsObjectHidden: ; f1a6 (3:71a6) jr nz, .loop ld c, a ld b, FLAG_TEST - ld hl, W_MISSABLEOBJECTFLAGS + ld hl, wMissableObjectFlags call MissableObjectFlagAction ld a, c and a @@ -3357,7 +3357,7 @@ IsObjectHidden: ; f1a6 (3:71a6) ; [wMissableObjectIndex]: index of the missable object to be added (global index) ShowObject: ; f1c8 (3:71c8) ShowObject2: - ld hl, W_MISSABLEOBJECTFLAGS + ld hl, wMissableObjectFlags ld a, [wMissableObjectIndex] ld c, a ld b, FLAG_RESET @@ -3367,7 +3367,7 @@ ShowObject2: ; removes missable object (items, leg. pokemon, etc.) from the map ; [wMissableObjectIndex]: index of the missable object to be removed (global index) HideObject: ; f1d7 (3:71d7) - ld hl, W_MISSABLEOBJECTFLAGS + ld hl, wMissableObjectFlags ld a, [wMissableObjectIndex] ld c, a ld b, FLAG_SET @@ -3619,7 +3619,7 @@ _AddPartyMon: ; f2e5 (3:72e5) ld a, [wcf91] ld [wd0b5], a call GetMonHeader - ld hl, W_MONHEADER + ld hl, wMonHeader ld a, [hli] ld [de], a ; species inc de @@ -3658,7 +3658,7 @@ _AddPartyMon: ; f2e5 (3:72e5) pop hl push hl - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a ; is this a wild mon caught in battle? jr nz, .copyEnemyMonData @@ -3713,7 +3713,7 @@ _AddPartyMon: ; f2e5 (3:72e5) ld [de], a inc de .copyMonTypesAndMoves - ld hl, W_MONHTYPES + ld hl, wMonHTypes ld a, [hli] ; type 1 ld [de], a inc de @@ -3722,7 +3722,7 @@ _AddPartyMon: ; f2e5 (3:72e5) inc de ld a, [hli] ; catch rate (held item in gen 2) ld [de], a - ld hl, W_MONHMOVES + ld hl, wMonHMoves ld a, [hli] inc de push de @@ -3751,7 +3751,7 @@ _AddPartyMon: ; f2e5 (3:72e5) inc de ld [de], a push de - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] ld d, a callab CalcExperience pop de @@ -3776,10 +3776,10 @@ _AddPartyMon: ; f2e5 (3:72e5) pop hl call AddPartyMon_WriteMovePP inc de - ld a, [W_CURENEMYLVL] + ld a, [wCurEnemyLVL] ld [de], a inc de - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a jr nz, .calcFreshStats ld hl, wEnemyMonMaxHP @@ -3899,7 +3899,7 @@ _MoveMon: ; f51e (3:751e) cp PARTY_TO_DAYCARE ld hl, wDayCareMon jr z, .asm_f575 - ld hl, W_NUMINBOX + ld hl, wNumInBox ld a, [hl] cp MONS_PER_BOX jr nz, .partyOrBoxNotFull @@ -3934,7 +3934,7 @@ _MoveMon: ; f51e (3:751e) jr nz, .skipToNewMonEntry ld hl, wBoxMons ld bc, wBoxMon2 - wBoxMon1 ; $21 - ld a, [W_NUMINBOX] + ld a, [wNumInBox] .skipToNewMonEntry dec a call AddNTimes @@ -3977,14 +3977,14 @@ _MoveMon: ; f51e (3:751e) .asm_f5b4 ld a, [wMoveMonType] cp PARTY_TO_DAYCARE - ld de, W_DAYCAREMONOT + ld de, wDayCareMonOT jr z, .asm_f5d3 dec a ld hl, wPartyMonOT ld a, [wPartyCount] jr nz, .asm_f5cd ld hl, wBoxMonOT - ld a, [W_NUMINBOX] + ld a, [wNumInBox] .asm_f5cd dec a call SkipFixedLengthTextEntries @@ -3995,7 +3995,7 @@ _MoveMon: ; f51e (3:751e) ld a, [wMoveMonType] and a jr z, .asm_f5e6 - ld hl, W_DAYCAREMONOT + ld hl, wDayCareMonOT cp DAYCARE_TO_PARTY jr z, .asm_f5ec ld hl, wPartyMonOT @@ -4007,14 +4007,14 @@ _MoveMon: ; f51e (3:751e) call CopyData ld a, [wMoveMonType] cp PARTY_TO_DAYCARE - ld de, W_DAYCAREMONNAME + ld de, wDayCareMonName jr z, .asm_f611 dec a ld hl, wPartyMonNicks ld a, [wPartyCount] jr nz, .asm_f60b ld hl, wBoxMonNicks - ld a, [W_NUMINBOX] + ld a, [wNumInBox] .asm_f60b dec a call SkipFixedLengthTextEntries @@ -4025,7 +4025,7 @@ _MoveMon: ; f51e (3:751e) ld a, [wMoveMonType] and a jr z, .asm_f624 - ld hl, W_DAYCAREMONNAME + ld hl, wDayCareMonName cp DAYCARE_TO_PARTY jr z, .asm_f62a ld hl, wPartyMonNicks @@ -4048,7 +4048,7 @@ _MoveMon: ; f51e (3:751e) call LoadMonData callba CalcLevelFromExperience ld a, d - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a pop hl ld bc, wBoxMon2 - wBoxMon1 add hl, bc @@ -4470,7 +4470,7 @@ InitPlayerData2: ld hl, wPartyCount call InitializeEmptyList - ld hl, W_NUMINBOX + ld hl, wNumInBox call InitializeEmptyList ld hl, wNumBagItems call InitializeEmptyList @@ -4488,7 +4488,7 @@ START_MONEY EQU $3000 ld [wMonDataLocation], a - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges ld [hli], a ld [hl], a @@ -4497,8 +4497,8 @@ START_MONEY EQU $3000 ld [hli], a ld [hl], a - ld hl, W_GAMEPROGRESSFLAGS - ld bc, wGameProgressFlagsEnd - W_GAMEPROGRESSFLAGS + ld hl, wGameProgressFlags + ld bc, wGameProgressFlagsEnd - wGameProgressFlags call FillMemory ; clear all game progress flags jp InitializeMissableObjectsFlags diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 1e34c99c..424a9af4 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -3,9 +3,9 @@ AgathaScript: ; 7642d (1d:642d) call EnableAutoTextBoxDrawing ld hl, AgathaTrainerHeaders ld de, AgathaScriptPointers - ld a, [W_AGATHACURSCRIPT] + ld a, [wAgathaCurScript] call ExecuteCurMapScriptInTable - ld [W_AGATHACURSCRIPT], a + ld [wAgathaCurScript], a ret AgathaScript_76443: ; 76443 (1d:6443) @@ -27,7 +27,7 @@ AgathaScript_76459: ; 76459 (1d:6459) AgathaScript_76464: ; 76464 (1d:6464) xor a - ld [W_AGATHACURSCRIPT], a + ld [wAgathaCurScript], a ret AgathaScriptPointers: ; 76469 (1d:6469) @@ -53,8 +53,8 @@ AgathaScript_76474: ; 76474 (1d:6474) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret AgathaScript0: ; 76490 (1d:6490) @@ -81,8 +81,8 @@ AgathaScript0: ; 76490 (1d:6490) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret CoordsData_764d1: ; 764d1 (1d:64d1) @@ -99,20 +99,20 @@ AgathaScript3: ; 764da (1d:64da) call Delay3 xor a ld [wJoyIgnore], a - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret AgathaScript2: ; 764ed (1d:64ed) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, AgathaScript_76464 ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret AgathaTextPointers: ; 76505 (1d:6505) diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 08ac98d6..d594f907 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -1,6 +1,6 @@ BillsHouseScript: ; 1e76a (7:676a) call EnableAutoTextBoxDrawing - ld a, [W_BILLSHOUSECURSCRIPT] + ld a, [wBillsHouseCurScript] ld hl, BillsHouseScriptPointers jp CallFunctionInTable @@ -26,7 +26,7 @@ BillsHouseScript1: ; 1e783 (7:6783) ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret MovementData_1e79c: ; 1e79c (7:679c) @@ -55,7 +55,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6) xor a ld [wJoyIgnore], a ld a, $3 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript3: ; 1e7c5 (7:67c5) @@ -84,7 +84,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5) ld de, MovementData_1e807 call MoveSprite ld a, $4 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret MovementData_1e807: ; 1e807 (7:6807) @@ -104,7 +104,7 @@ BillsHouseScript4: ; 1e80d (7:680d) SetEvent EVENT_MET_BILL_2 ; this event seems redundant SetEvent EVENT_MET_BILL ld a, $0 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript5: ; 1e827 (7:6827) @@ -112,7 +112,7 @@ BillsHouseScript5: ; 1e827 (7:6827) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $0 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseTextPointers: ; 1e834 (7:6834) @@ -136,7 +136,7 @@ BillsHouseText1: ; 1e83d (7:683d) ld hl, BillsHouseText_1e86a call PrintText ld a, $1 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a jr .asm_1e862 .asm_1e85a ld hl, BillsHouseText_1e86f diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 6aa2eaec..eadcd388 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -1,7 +1,7 @@ BluesHouseScript: ; 19b3b (6:5b3b) call EnableAutoTextBoxDrawing ld hl,BluesHouseScriptPointers - ld a,[W_BLUESHOUSECURSCRIPT] + ld a,[wBluesHouseCurScript] jp CallFunctionInTable BluesHouseScriptPointers: ; 19b47 (6:5b47) @@ -13,7 +13,7 @@ BluesHouseScript0: ; 19b4b (6:5b4b) ; trigger the next script ld a,1 - ld [W_BLUESHOUSECURSCRIPT],a + ld [wBluesHouseCurScript],a ret BluesHouseScript1: ; 19b56 (6:5b56) diff --git a/scripts/bruno.asm b/scripts/bruno.asm index bdfd7e24..28671db5 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -3,9 +3,9 @@ BrunoScript: ; 762d6 (1d:62d6) call EnableAutoTextBoxDrawing ld hl, BrunoTrainerHeaders ld de, BrunoScriptPointers - ld a, [W_BRUNOCURSCRIPT] + ld a, [wBrunoCurScript] call ExecuteCurMapScriptInTable - ld [W_BRUNOCURSCRIPT], a + ld [wBrunoCurScript], a ret BrunoScript_762ec: ; 762ec (1d:62ec) @@ -27,7 +27,7 @@ BrunoScript_76302: ; 76302 (1d:6302) BrunoScript_7630d: ; 7630d (1d:630d) xor a - ld [W_BRUNOCURSCRIPT], a + ld [wBrunoCurScript], a ret BrunoScriptPointers: ; 76312 (1d:6312) @@ -53,8 +53,8 @@ BrunoScript_7631d: ; 7631d (1d:631d) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_BRUNOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wBrunoCurScript], a + ld [wCurMapScript], a ret BrunoScript0: ; 76339 (1d:6339) @@ -81,8 +81,8 @@ BrunoScript0: ; 76339 (1d:6339) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_BRUNOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wBrunoCurScript], a + ld [wCurMapScript], a ret CoordsData_7637a: ; 7637a (1d:637a) @@ -99,13 +99,13 @@ BrunoScript3: ; 76383 (1d:6383) call Delay3 xor a ld [wJoyIgnore], a - ld [W_BRUNOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wBrunoCurScript], a + ld [wCurMapScript], a ret BrunoScript2: ; 76396 (1d:6396) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, BrunoScript_7630d ld a, $1 diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 787a2f3d..dd534dba 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -3,7 +3,7 @@ CeladonGameCornerScript: ; 48bbd (12:4bbd) call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing ld hl, CeladonGameCornerScriptPointers - ld a, [W_CELADONGAMECORNERCURSCRIPT] + ld a, [wCeladonGameCornerCurScript] jp CallFunctionInTable CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) @@ -38,8 +38,8 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec) CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) xor a ld [wJoyIgnore], a - ld [W_CELADONGAMECORNERCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGameCornerCurScript], a + ld [wCurMapScript], a ret CeladonGameCornerScriptPointers: ; 48c12 (12:4c12) @@ -51,7 +51,7 @@ CeladonGameCornerScript0: ; 48c18 (12:4c18) ret CeladonGameCornerScript1: ; 48c19 (12:4c19) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeladonGameCornerScript_48c07 ld a, $f0 @@ -63,13 +63,13 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_48c5a - ld a, [W_YCOORD] + ld a, [wYCoord] cp $6 jr nz, .asm_48c43 ld de, MovementData_48c63 jr .asm_48c4d .asm_48c43 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $8 jr nz, .asm_48c4d ld de, MovementData_48c63 @@ -78,7 +78,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a ret MovementData_48c5a: ; 48c5a (12:4c5a) @@ -113,7 +113,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69) set 5, [hl] set 6, [hl] ld a, $0 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a ret CeladonGameCornerTextPointers: ; 48c8a (12:4c8a) @@ -424,7 +424,7 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d) ld [hJoyPressed], a ld [hJoyReleased], a ld a, $1 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a jp TextScriptEnd CeladonGameCornerText_48ece: ; 48ece (12:4ece) diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 64e85ff7..d774ea95 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -6,9 +6,9 @@ CeladonGymScript: ; 4890a (12:490a) call EnableAutoTextBoxDrawing ld hl, CeladonGymTrainerHeaders ld de, CeladonGymScriptPointers - ld a, [W_CELADONGYMCURSCRIPT] + ld a, [wCeladonGymCurScript] call ExecuteCurMapScriptInTable - ld [W_CELADONGYMCURSCRIPT], a + ld [wCeladonGymCurScript], a ret CeladonGymScript_48927: ; 48927 (12:4927) @@ -25,8 +25,8 @@ Gym4LeaderName: ; 4893d (12:493d) CeladonGymText_48943: ; 48943 (12:4943) xor a ld [wJoyIgnore], a - ld [W_CELADONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGymCurScript], a + ld [wCurMapScript], a ret CeladonGymScriptPointers: ; 4894e (12:494e) @@ -36,7 +36,7 @@ CeladonGymScriptPointers: ; 4894e (12:494e) dw CeladonGymScript3 CeladonGymScript3: ; 48956 (12:4956) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeladonGymText_48943 ld a, $f0 @@ -60,7 +60,7 @@ CeladonGymText_48963: ; 48963 (12:4963) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_4898c - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 3, [hl] ld hl, wBeatGymFlags set 3, [hl] @@ -176,10 +176,10 @@ CeladonGymText1: ; 48a11 (12:4a11) call EngageMapTrainer call InitBattleEnemyParameters ld a, $4 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a ld a, $3 - ld [W_CELADONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGymCurScript], a + ld [wCurMapScript], a .asm_48a5b jp TextScriptEnd diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index e0444a1c..1e8349bc 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -1,13 +1,13 @@ CeruleanCityScript: ; 19480 (6:5480) call EnableAutoTextBoxDrawing ld hl, CeruleanCityScriptPointers - ld a, [W_CERULEANCITYCURSCRIPT] + ld a, [wCeruleanCityCurScript] jp CallFunctionInTable CeruleanCityScript_1948c: ; 1948c (6:548c) xor a ld [wJoyIgnore], a - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ld a, HS_CERULEAN_RIVAL ld [wMissableObjectIndex], a predef_jump HideObject @@ -20,7 +20,7 @@ CeruleanCityScriptPointers: ; 1949d (6:549d) dw CeruleanCityScript4 CeruleanCityScript4: ; 194a7 (6:54a7) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c ld a, $f0 @@ -31,7 +31,7 @@ CeruleanCityScript4: ; 194a7 (6:54a7) call DisplayTextID xor a ld [wJoyIgnore], a - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityScript0: ; 194c8 (6:54c8) @@ -75,7 +75,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a - ld a, [W_XCOORD] + ld a, [wXCoord] cp $14 jr z, .asm_19535 ld a, $1 @@ -93,7 +93,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [H_SPRITEINDEX], a call MoveSprite ld a, $1 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityCoords1: ; 1954f (6:554f) @@ -135,10 +135,10 @@ CeruleanCityScript1: ; 19567 (6:5567) ld de, CeruleanCityText_19672 call SaveEndBattleTextPointers ld a, OPP_SONY1 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $7 @@ -151,17 +151,17 @@ CeruleanCityScript1: ; 19567 (6:5567) .Charmander ld a, $9 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a xor a ld [hJoyHeld], a call CeruleanCityScript_1955d ld a, $2 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityScript2: ; 195b1 (6:55b1) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c call CeruleanCityScript_1955d @@ -178,7 +178,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld a, $1 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld a, [W_XCOORD] + ld a, [wXCoord] cp $14 jr nz, .asm_195f0 ld de, CeruleanCityMovement4 @@ -190,7 +190,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld [H_SPRITEINDEX], a call MoveSprite ld a, $3 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityMovement3: ; 19600 (6:5600) @@ -224,7 +224,7 @@ CeruleanCityScript3: ; 19610 (6:5610) ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityTextPointers: ; 1962d (6:562d) @@ -294,7 +294,7 @@ CeruleanCityText2: ; 1967c (6:567c) call EngageMapTrainer call InitBattleEnemyParameters ld a, $4 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a jp TextScriptEnd .asm_4ca20 ld hl, CeruleanCityText_196f3 diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index ca1c2c7d..6bdbc298 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -6,9 +6,9 @@ CeruleanGymScript: ; 5c6b3 (17:46b3) call EnableAutoTextBoxDrawing ld hl, CeruleanGymTrainerHeaders ld de, CeruleanGymScriptPointers - ld a, [W_CERULEANGYMCURSCRIPT] + ld a, [wCeruleanGymCurScript] call ExecuteCurMapScriptInTable - ld [W_CERULEANGYMCURSCRIPT], a + ld [wCeruleanGymCurScript], a ret CeruleanGymScript_5c6d0: ; 5c6d0 (17:46d0) @@ -25,8 +25,8 @@ Gym2LeaderName: ; 5c6e7 (17:46e7) CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed) xor a ld [wJoyIgnore], a - ld [W_CERULEANGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeruleanGymCurScript], a + ld [wCurMapScript], a ret CeruleanGymScriptPointers: ; 5c6f8 (17:46f8) @@ -36,7 +36,7 @@ CeruleanGymScriptPointers: ; 5c6f8 (17:46f8) dw CeruleanGymScript3 CeruleanGymScript3: ; 5c700 (17:4700) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeruleanGymScript_5c6ed ld a, $f0 @@ -60,7 +60,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c736 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 1, [hl] ld hl, wBeatGymFlags set 1, [hl] @@ -127,11 +127,11 @@ CeruleanGymText1: ; 5c771 (17:4771) call EngageMapTrainer call InitBattleEnemyParameters ld a, $2 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a xor a ld [hJoyHeld], a ld a, $3 - ld [W_CERULEANGYMCURSCRIPT], a + ld [wCeruleanGymCurScript], a .asm_5c7bb jp TextScriptEnd diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 5bbb94a9..6b347652 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -2,7 +2,7 @@ CinnabarGymScript: ; 7574a (1d:574a) call CinnabarGymScript_75759 call EnableAutoTextBoxDrawing ld hl, CinnabarGymScriptPointers - ld a, [W_CINNABARGYMCURSCRIPT] + ld a, [wCinnabarGymCurScript] jp CallFunctionInTable CinnabarGymScript_75759: ; 75759 (1d:5759) @@ -30,8 +30,8 @@ Gym7LeaderName: ; 7578b (1d:578b) CinnabarGymScript_75792: ; 75792 (1d:5792) xor a ld [wJoyIgnore], a - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a ld [wOpponentAfterWrongAnswer], a ret @@ -64,8 +64,8 @@ CinnabarGymScript0: ; 757ae (1d:57ae) .asm_757cb call MoveSprite ld a, $1 - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a ret MovementData_757d7: ; 757d7 (1d:57d7) @@ -92,7 +92,7 @@ CinnabarGymFlagAction: ; 757f1 (1d:57f1) predef_jump FlagActionPredef CinnabarGymScript2: ; 757f6 (1d:57f6) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CinnabarGymScript_75792 ld a, [wTrainerHeaderFlagBit] @@ -129,12 +129,12 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) ld [wJoyIgnore], a ld [wOpponentAfterWrongAnswer], a ld a, $0 - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a ret CinnabarGymScript3: ; 7584a (1d:584a) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CinnabarGymScript_75792 ld a, $f0 @@ -157,7 +157,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_75880 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 6, [hl] ld hl, wBeatGymFlags set 6, [hl] @@ -200,8 +200,8 @@ CinnabarGymScript_758b7: ; 758b7 (1d:58b7) .asm_758d4 ld a, $3 .asm_758d6 - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a jp TextScriptEnd CinnabarGymText1: ; 758df (1d:58df) @@ -224,7 +224,7 @@ CinnabarGymText1: ; 758df (1d:58df) ld de, BlaineEndBattleText call SaveEndBattleTextPointers ld a, $7 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a jp CinnabarGymScript_758b7 BlaineBattleText: ; 75914 (1d:5914) diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index c06c784c..7f8616b1 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -5,7 +5,7 @@ CinnabarIslandScript: ; 1ca19 (7:4a19) ResetEvent EVENT_MANSION_SWITCH_ON ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL ld hl, CinnabarIslandScriptPointers - ld a, [W_CINNABARISLANDCURSCRIPT] + ld a, [wCinnabarIslandCurScript] jp CallFunctionInTable CinnabarIslandScriptPointers: ; 1ca34 (7:4a34) @@ -16,10 +16,10 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld b, SECRET_KEY call IsItemInBag ret nz - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $12 ret nz ld a, PLAYER_DIR_UP @@ -38,7 +38,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld [wSpriteStateData1 + 9], a ld [wJoyIgnore], a ld a, $1 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandScript1: ; 1ca73 (7:4a73) @@ -47,7 +47,7 @@ CinnabarIslandScript1: ; 1ca73 (7:4a73) ret nz call Delay3 ld a, $0 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandTextPointers: ; 1ca81 (7:4a81) diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 3eabb0bc..4a46e648 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -7,7 +7,7 @@ DayCareMTextPointers: ; 56252 (15:6252) DayCareMText1: ; 56254 (15:6254) TX_ASM call SaveScreenTilesToBuffer2 - ld a, [W_DAYCARE_IN_USE] + ld a, [wDayCareInUse] and a jp nz, .daycareInUse ld hl, DayCareIntroText @@ -46,7 +46,7 @@ DayCareMText1: ; 56254 (15:6254) ld hl, DayCareWillLookAfterMonText call PrintText ld a, 1 - ld [W_DAYCARE_IN_USE], a + ld [wDayCareInUse], a ld a, PARTY_TO_DAYCARE ld [wMoveMonType], a call MoveMon @@ -60,7 +60,7 @@ DayCareMText1: ; 56254 (15:6254) .daycareInUse xor a - ld hl, W_DAYCAREMONNAME + ld hl, wDayCareMonName call GetPartyMonName ld a, DAYCARE_DATA ld [wMonDataLocation], a @@ -150,7 +150,7 @@ DayCareMText1: ; 56254 (15:6254) .enoughMoney xor a - ld [W_DAYCARE_IN_USE], a + ld [wDayCareInUse], a ld hl, wDayCareNumLevelsGrown ld [hli], a inc hl diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index fa05d486..fb3ea5b4 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -2,16 +2,16 @@ FightingDojoScript: ; 5cd5d (17:4d5d) call EnableAutoTextBoxDrawing ld hl, FightingDojoTrainerHeaders ld de, FightingDojoScriptPointers - ld a, [W_FIGHTINGDOJOCURSCRIPT] + ld a, [wFightingDojoCurScript] call ExecuteCurMapScriptInTable - ld [W_FIGHTINGDOJOCURSCRIPT], a + ld [wFightingDojoCurScript], a ret FightingDojoScript_5cd70: ; 5cd70 (17:4d70) xor a ld [wJoyIgnore], a - ld [W_FIGHTINGDOJOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a ret FightingDojoScriptPointers: ; 5cd7b (17:4d7b) @@ -32,10 +32,10 @@ FightingDojoScript1: ; 5cd83 (17:4d83) xor a ld [hJoyHeld], a ld [wcf0d], a - ld a, [W_YCOORD] + ld a, [wYCoord] cp $3 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $4 ret nz ld a, $1 @@ -53,7 +53,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83) ret FightingDojoScript3: ; 5cdc6 (17:4dc6) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, FightingDojoScript_5cd70 ld a, [wcf0d] @@ -76,8 +76,8 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6) call DisplayTextID xor a ld [wJoyIgnore], a - ld [W_FIGHTINGDOJOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a ret FightingDojoTextPointers: ; 5ce03 (17:4e03) @@ -148,8 +148,8 @@ FightingDojoText1: ; 5ce44 (17:4e44) call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [W_FIGHTINGDOJOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a jr .asm_9dba4 .continue1 ld hl, FightingDojoText_5ce9d diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 3ec89256..2788a70a 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -3,9 +3,9 @@ FuchsiaGymScript: ; 7543d (1d:543d) call EnableAutoTextBoxDrawing ld hl, FuchsiaGymTrainerHeaders ld de, FuchsiaGymScriptPointers - ld a, [W_FUCHSIAGYMCURSCRIPT] + ld a, [wFuchsiaGymCurScript] call ExecuteCurMapScriptInTable - ld [W_FUCHSIAGYMCURSCRIPT], a + ld [wFuchsiaGymCurScript], a ret FuchsiaGymScript_75453: ; 75453 (1d:5453) @@ -26,8 +26,8 @@ Gym5LeaderName: ; 75472 (1d:5472) FuchsiaGymScript_75477: ; 75477 (1d:5477) xor a ld [wJoyIgnore], a - ld [W_FUCHSIAGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFuchsiaGymCurScript], a + ld [wCurMapScript], a ret FuchsiaGymScriptPointers: ; 75482 (1d:5482) @@ -37,7 +37,7 @@ FuchsiaGymScriptPointers: ; 75482 (1d:5482) dw FuchsiaGymScript3 FuchsiaGymScript3: ; 7548a (1d:548a) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, FuchsiaGymScript_75477 ld a, $f0 @@ -60,7 +60,7 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_754c0 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 4, [hl] ld hl, wBeatGymFlags set 4, [hl] @@ -167,11 +167,11 @@ FuchsiaGymText1: ; 75534 (1d:5534) call EngageMapTrainer call InitBattleEnemyParameters ld a, $5 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a xor a ld [hJoyHeld], a ld a, $3 - ld [W_FUCHSIAGYMCURSCRIPT], a + ld [wFuchsiaGymCurScript], a .asm_e84c6 jp TextScriptEnd diff --git a/scripts/gary.asm b/scripts/gary.asm index 3215a04f..8db7544f 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -1,13 +1,13 @@ GaryScript: ; 75f1d (1d:5f1d) call EnableAutoTextBoxDrawing ld hl, GaryScriptPointers - ld a, [W_GARYCURSCRIPT] + ld a, [wGaryCurScript] jp CallFunctionInTable GaryScript_75f29: ; 75f29 (1d:5f29) xor a ld [wJoyIgnore], a - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScriptPointers: ; 75f31 (1d:5f31) @@ -36,7 +36,7 @@ GaryScript1: ; 75f48 (1d:5f48) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $2 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret RLEMovement75f63: ; 75f63 (1d:5f63) @@ -52,7 +52,7 @@ GaryScript2: ; 75f6a (1d:5f6a) call Delay3 xor a ld [wJoyIgnore], a - ld hl, W_OPTIONS + ld hl, wOptions res 7, [hl] ld a, $1 ld [hSpriteIndexOrTextID], a @@ -65,10 +65,10 @@ GaryScript2: ; 75f6a (1d:5f6a) ld de, GaryText_760fe call SaveEndBattleTextPointers ld a, OPP_SONY3 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $1 @@ -81,16 +81,16 @@ GaryScript2: ; 75f6a (1d:5f6a) .Charmander ld a, $3 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a xor a ld [hJoyHeld], a ld a, $3 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript3: ; 75fbb (1d:5fbb) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, GaryScript_75f29 call UpdateSprites @@ -104,7 +104,7 @@ GaryScript3: ; 75fbb (1d:5fbb) ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript4: ; 75fe4 (1d:5fe4) @@ -123,7 +123,7 @@ GaryScript4: ; 75fe4 (1d:5fe4) ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret MovementData_76014: ; 76014 (1d:6014) @@ -154,7 +154,7 @@ GaryScript5: ; 7601a (1d:601a) ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript6: ; 76047 (1d:6047) @@ -167,7 +167,7 @@ GaryScript6: ; 76047 (1d:6047) ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript7: ; 7605f (1d:605f) @@ -184,7 +184,7 @@ GaryScript7: ; 7605f (1d:605f) ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret MovementData_76080: ; 76080 (1d:6080) @@ -200,7 +200,7 @@ GaryScript8: ; 76083 (1d:6083) ld [wMissableObjectIndex], a predef HideObject ld a, $9 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript9: ; 76099 (1d:6099) @@ -213,7 +213,7 @@ GaryScript9: ; 76099 (1d:6099) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $a - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret RLEMovement760b4: ; 760b4 (1d:60b4) @@ -228,7 +228,7 @@ GaryScript10: ; 760b9 (1d:60b9) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript_760c8: ; 760c8 (1d:60c8) @@ -278,7 +278,7 @@ GaryText2: ; 76108 (1d:6108) GaryText3: ; 7610d (1d:610d) TX_ASM - ld a, [W_PLAYERSTARTER] + ld a, [wPlayerStarter] ld [wd11e], a call GetMonName ld hl, GaryText_76120 diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index de3cd779..89b1123e 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -1,13 +1,13 @@ HallofFameRoomScript: ; 5a49e (16:649e) call EnableAutoTextBoxDrawing ld hl, HallofFameRoomScriptPointers - ld a, [W_HALLOFFAMEROOMCURSCRIPT] + ld a, [wHallOfFameRoomCurScript] jp CallFunctionInTable HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa) xor a ld [wJoyIgnore], a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret HallofFameRoomScriptPointers: ; 5a4b2 (16:64b2) @@ -28,21 +28,21 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) predef HallOfFamePC pop af ld [wLetterPrintingDelayFlags], a - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 res 1, [hl] inc hl set 0, [hl] xor a - ld hl, W_LORELEICURSCRIPT + ld hl, wLoreleiCurScript ld [hli], a ld [hli], a ld [hl], a - ld [W_LANCECURSCRIPT], a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wLanceCurScript], a + ld [wHallOfFameRoomCurScript], a ; Elite 4 events ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 xor a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ld a, PALLET_TOWN ld [wLastBlackoutMap], a callba SaveSAVtoSRAM @@ -65,7 +65,7 @@ HallofFameRoomScript0: ; 5a50d (16:650d) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret RLEMovement5a528: ; 5a528 (16:6528) @@ -98,7 +98,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b) ld [wMissableObjectIndex], a predef HideObject ld a, $2 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret HallofFameRoomTextPointers: ; 5a56a (16:656a) diff --git a/scripts/lab4.asm b/scripts/lab4.asm index dab07824..7eb6bae8 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -74,7 +74,7 @@ Lab4Text1: ; 75d6c (1d:5d6c) ld hl, Lab4Text_75dd5 call PrintText SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON - ld a, [W_FOSSILMON] + ld a, [wFossilMon] ld b, a ld c, 30 call GivePokemon diff --git a/scripts/lance.asm b/scripts/lance.asm index e2c43614..97323c88 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -3,9 +3,9 @@ LanceScript: ; 5a2ae (16:62ae) call EnableAutoTextBoxDrawing ld hl, LanceTrainerHeaders ld de, LanceScriptPointers - ld a, [W_LANCECURSCRIPT] + ld a, [wLanceCurScript] call ExecuteCurMapScriptInTable - ld [W_LANCECURSCRIPT], a + ld [wLanceCurScript], a ret LanceScript_5a2c4: ; 5a2c4 (16:62c4) @@ -37,7 +37,7 @@ LanceScript_5a2f0: ; 5a2f0 (16:62f0) LanceScript_5a2f5: ; 5a2f5 (16:62f5) xor a - ld [W_LANCECURSCRIPT], a + ld [wLanceCurScript], a ret LanceScriptPointers: ; 5a2fa (16:62fa) @@ -85,7 +85,7 @@ CoordsData_5a33e: ; 5a33e (16:633e) LanceScript2: ; 5a349 (16:6349) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, LanceScript_5a2f5 ld a, $1 @@ -102,8 +102,8 @@ LanceScript_5a35b: ; 5a35b (16:635b) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_LANCECURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLanceCurScript], a + ld [wCurMapScript], a ret RLEList_5a379: ; 5a379 (16:6379) @@ -120,8 +120,8 @@ LanceScript3: ; 5a382 (16:6382) call Delay3 xor a ld [wJoyIgnore], a - ld [W_LANCECURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLanceCurScript], a + ld [wCurMapScript], a ret LanceTextPointers: ; 5a395 (16:6395) diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 43eee966..6d67d489 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -3,9 +3,9 @@ LoreleiScript: ; 7617b (1d:617b) call EnableAutoTextBoxDrawing ld hl, LoreleiTrainerHeaders ld de, LoreleiScriptPointers - ld a, [W_LORELEICURSCRIPT] + ld a, [wLoreleiCurScript] call ExecuteCurMapScriptInTable - ld [W_LORELEICURSCRIPT], a + ld [wLoreleiCurScript], a ret LoreleiScript_76191: ; 76191 (1d:6191) @@ -28,7 +28,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) LoreleiScript_761b6: ; 761b6 (1d:61b6) xor a - ld [W_LORELEICURSCRIPT], a + ld [wLoreleiCurScript], a ret LoreleiScriptPointers: ; 761bb (1d:61bb) @@ -54,8 +54,8 @@ LoreleiScript_761c6: ; 761c6 (1d:61c6) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_LORELEICURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLoreleiCurScript], a + ld [wCurMapScript], a ret LoreleiScript0: ; 761e2 (1d:61e2) @@ -82,8 +82,8 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_LORELEICURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLoreleiCurScript], a + ld [wCurMapScript], a ret CoordsData_76223: ; 76223 (1d:6223) @@ -100,12 +100,12 @@ LoreleiScript3: ; 7622c (1d:622c) call Delay3 xor a ld [wJoyIgnore], a - ld [W_LORELEICURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLoreleiCurScript], a + ld [wCurMapScript], a ret LoreleiScript2: ; 7623f (1d:623f) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, LoreleiScript_761b6 ld a, $1 diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index bbfb0a0b..2b14176d 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -3,9 +3,9 @@ Mansion1Script: ; 442af (11:42af) call EnableAutoTextBoxDrawing ld hl, Mansion1TrainerHeaders ld de, Mansion1ScriptPointers - ld a, [W_MANSION1CURSCRIPT] + ld a, [wMansion1CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION1CURSCRIPT], a + ld [wMansion1CurScript], a ret Mansion1Subscript1: ; 442c5 (11:42c5) diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 22bc2b12..5e94fdfc 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -3,9 +3,9 @@ Mansion2Script: ; 51fd8 (14:5fd8) call EnableAutoTextBoxDrawing ld hl, Mansion2TrainerHeaders ld de, Mansion2ScriptPointers - ld a, [W_MANSION2CURSCRIPT] + ld a, [wMansion2CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION2CURSCRIPT], a + ld [wMansion2CurScript], a ret Mansion2Script_51fee: ; 51fee (14:5fee) diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index e49667ef..e3b9993d 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -3,9 +3,9 @@ Mansion3Script: ; 521ee (14:61ee) call EnableAutoTextBoxDrawing ld hl, Mansion3TrainerHeader0 ld de, Mansion3ScriptPointers - ld a, [W_MANSION3CURSCRIPT] + ld a, [wMansion3CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION3CURSCRIPT], a + ld [wMansion3CurScript], a ret Mansion3Script_52204: ; 52204 (14:6204) diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index 59ee3704..5d1498bd 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -3,9 +3,9 @@ Mansion4Script: ; 523b9 (14:63b9) call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeader0 ld de, Mansion4ScriptPointers - ld a, [W_MANSION4CURSCRIPT] + ld a, [wMansion4CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION4CURSCRIPT], a + ld [wMansion4CurScript], a ret Mansion4Script_523cf: ; 523cf (14:63cf) diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index 4a5eeae3..98ed2784 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -2,9 +2,9 @@ MtMoon1Script: ; 499c8 (12:59c8) call EnableAutoTextBoxDrawing ld hl, MtMoon1TrainerHeader0 ld de, MtMoon1ScriptPointers - ld a, [W_MTMOON1CURSCRIPT] + ld a, [wMtMoon1CurScript] call ExecuteCurMapScriptInTable - ld [W_MTMOON1CURSCRIPT], a + ld [wMtMoon1CurScript], a ret MtMoon1ScriptPointers: ; 499db (12:59db) diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 84c00981..af2ec1e5 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -2,9 +2,9 @@ MtMoon3Script: ; 49d0b (12:5d0b) call EnableAutoTextBoxDrawing ld hl, MtMoon3TrainerHeader0 ld de, MtMoon3ScriptPointers - ld a, [W_MTMOON3CURSCRIPT] + ld a, [wMtMoon3CurScript] call ExecuteCurMapScriptInTable - ld [W_MTMOON3CURSCRIPT], a + ld [wMtMoon3CurScript], a CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD ret z ld hl, CoordsData_49d37 @@ -40,8 +40,8 @@ CoordsData_49d37: ; 49d37 (12:5d37) MtMoon3Script_49d58: ; 49d58 (12:5d58) xor a ld [wJoyIgnore], a - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a ret MtMoon3ScriptPointers: ; 49d63 (12:5d63) @@ -55,10 +55,10 @@ MtMoon3ScriptPointers: ; 49d63 (12:5d63) MtMoon3Script0: ; 49d6f (12:5d6f) CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD jp nz, MtMoon3Script_49d91 - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 jp nz, MtMoon3Script_49d91 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $d jp nz, MtMoon3Script_49d91 xor a @@ -73,7 +73,7 @@ MtMoon3Script_49d91: ; 49d91 (12:5d91) ret MtMoon3Script3: ; 49d9a (12:5d9a) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, MtMoon3Script_49d58 call UpdateSprites @@ -82,8 +82,8 @@ MtMoon3Script3: ; 49d9a (12:5d9a) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a ret MtMoon3Script4: ; 49dba (12:5dba) @@ -105,8 +105,8 @@ MtMoon3Script4: ; 49dba (12:5dba) ld [H_SPRITEINDEX], a call MoveSprite ld a, $5 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a ret CoordsData_49dea: ; 49dea (12:5dea) @@ -150,8 +150,8 @@ MtMoon3Script5: ; 49dfb (12:5dfb) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a ret MtMoon3TextPointers: ; 49e34 (12:5e34) @@ -228,8 +228,8 @@ MtMoon3Text1: ; 49e79 (12:5e79) call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a jr .asm_49ebe .asm_49eb8 ld hl, MtMoon3Text_49f94 @@ -280,8 +280,8 @@ MtMoon3Text6: ; 49ee9 (12:5ee9) predef HideObject SetEvent EVENT_GOT_DOME_FOSSIL ld a, $4 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a .asm_49f21 jp TextScriptEnd @@ -308,8 +308,8 @@ MtMoon3Text7: ; 49f29 (12:5f29) predef HideObject SetEvent EVENT_GOT_HELIX_FOSSIL ld a, $4 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a .asm_49f61 jp TextScriptEnd diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index ac552c6d..780c3905 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -4,7 +4,7 @@ Museum1FScript: ; 5c0f7 (17:40f7) xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, Museum1FScriptPointers - ld a, [W_MUSEUM1FCURSCRIPT] + ld a, [wMuseum1fCurScript] jp CallFunctionInTable Museum1FScriptPointers: ; 5c109 (17:4109) @@ -12,13 +12,13 @@ Museum1FScriptPointers: ; 5c109 (17:4109) dw Museum1FScript1 Museum1FScript0: ; 5c10d (17:410d) - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $9 jr z, .asm_5c120 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $a ret nz .asm_5c120 @@ -40,17 +40,17 @@ Museum1FTextPointers: ; 5c12b (17:412b) Museum1FText1: ; 5c135 (17:4135) TX_ASM - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 jr nz, .asm_8774b - ld a, [W_XCOORD] + ld a, [wXCoord] cp $d jp z, Museum1FScript_5c1f9 jr .asm_b8709 .asm_8774b cp $3 jr nz, .asm_d49e7 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $c jp z, Museum1FScript_5c1f9 .asm_d49e7 @@ -120,7 +120,7 @@ Museum1FText1: ; 5c135 (17:4135) jr Museum1FScriptEnd .asm_0b094 ld a, $1 - ld [W_MUSEUM1FCURSCRIPT], a + ld [wMuseum1fCurScript], a jr Museum1FScriptEnd Museum1FScript_5c1f9: ; 5c1f9 (17:41f9) diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index c5ca2e6e..e308b7b5 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -6,7 +6,7 @@ OaksLabScript: ; 1cb0e (7:4b0e) xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, OaksLabScriptPointers - ld a, [W_OAKSLABCURSCRIPT] + ld a, [wOaksLabCurScript] jp CallFunctionInTable OaksLabScriptPointers: ; 1cb28 (7:4b28) @@ -43,7 +43,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e) res 4, [hl] ld a, $1 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript1: ; 1cb6e (7:4b6e) @@ -53,7 +53,7 @@ OaksLabScript1: ; 1cb6e (7:4b6e) call MoveSprite ld a, $2 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OakEntryMovement: ; 1cb7e (7:4b7e) @@ -74,7 +74,7 @@ OaksLabScript2: ; 1cb82 (7:4b82) predef ShowObject ld a, $3 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript3: ; 1cba2 (7:4ba2) @@ -97,7 +97,7 @@ OaksLabScript3: ; 1cba2 (7:4ba2) call SetSpriteFacingDirectionAndDelay ld a, $4 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret PlayerEntryMovementRLE: ; 1cbcf (7:4bcf) @@ -116,12 +116,12 @@ OaksLabScript4: ; 1cbd2 (7:4bd2) ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call UpdateSprites - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 res 1, [hl] call PlayDefaultMusic ld a, $5 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript5: ; 1cbfd (7:4bfd) @@ -147,11 +147,11 @@ OaksLabScript5: ; 1cbfd (7:4bfd) ld [wJoyIgnore], a ld a, $6 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript6: ; 1cc36 (7:4c36) - ld a, [W_YCOORD] + ld a, [wYCoord] cp $6 ret nz ld a, $5 @@ -177,7 +177,7 @@ OaksLabScript6: ; 1cc36 (7:4c36) ld [wPlayerMovingDirection], a ld a, $7 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript7: ; 1cc72 (7:4c72) @@ -187,11 +187,11 @@ OaksLabScript7: ; 1cc72 (7:4c72) call Delay3 ld a, $6 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript8: ; 1cc80 (7:4c80) - ld a, [W_PLAYERSTARTER] + ld a, [wPlayerStarter] cp STARTER1 jr z, .Charmander cp STARTER2 @@ -199,7 +199,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) jr .Bulbasaur .Charmander ld de, .MiddleBallMovement1 - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ; is the player standing below the table? jr z, .asm_1ccf3 ld de, .MiddleBallMovement2 @@ -223,7 +223,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) .Squirtle ld de, .RightBallMovement1 - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ; is the player standing below the table? jr z, .asm_1ccf3 ld de, .RightBallMovement2 @@ -249,7 +249,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) .Bulbasaur ld de, .LeftBallMovement1 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $9 ; is the player standing to the right of the table? jr nz, .asm_1ccf3 push hl @@ -285,7 +285,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) call MoveSprite ld a, $9 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript9: ; 1cd00 (7:4d00) @@ -319,7 +319,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) predef HideObject call Delay3 ld a, [wRivalStarterTemp] - ld [W_RIVALSTARTER], a + ld [wRivalStarter], a ld [wcf91], a ld [wd11e], a call GetMonName @@ -336,11 +336,11 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld [wJoyIgnore], a ld a, $a - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript10: ; 1cd6d (7:4d6d) - ld a, [W_YCOORD] + ld a, [wYCoord] cp $6 ret nz ld a, $1 @@ -372,7 +372,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) call MoveSprite ld a, $b - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript11: ; 1cdb9 (7:4db9) @@ -382,8 +382,8 @@ OaksLabScript11: ; 1cdb9 (7:4db9) ; define which team rival uses, and fight it ld a, OPP_SONY1 - ld [W_CUROPPONENT], a - ld a, [W_RIVALSTARTER] + ld [wCurOpponent], a + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $1 @@ -396,7 +396,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) .Charmander ld a, $3 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a ld a, $1 ld [wSpriteIndex], a call GetSpritePosition1 @@ -411,7 +411,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a ld a, $c - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript12: ; 1ce03 (7:4e03) @@ -432,7 +432,7 @@ OaksLabScript12: ; 1ce03 (7:4e03) SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB ld a, $d - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript13: ; 1ce32 (7:4e32) @@ -446,7 +446,7 @@ OaksLabScript13: ; 1ce32 (7:4e32) ld [H_SPRITEINDEX], a ld de, .RivalExitMovement call MoveSprite - ld a, [W_XCOORD] + ld a, [wXCoord] cp $4 ; move left or right depending on where the player is standing jr nz, .moveLeft @@ -458,7 +458,7 @@ OaksLabScript13: ; 1ce32 (7:4e32) ld [wNPCMovementDirections], a ld a, $e - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .RivalExitMovement @@ -481,14 +481,14 @@ OaksLabScript14: ; 1ce6d (7:4e6d) ld [wJoyIgnore], a call PlayDefaultMusic ; reset to map music ld a, $12 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a jr .done ; make the player keep facing the rival as he walks away .asm_1ce8c ld a, [wNPCNumScriptedSteps] cp $5 jr nz, .asm_1cea8 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $4 jr nz, .asm_1cea1 ld a, SPRITE_FACING_RIGHT @@ -535,7 +535,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) call MoveSprite ld a, $10 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript_1cefd: ; 1cefd (7:4efd) @@ -621,7 +621,7 @@ OaksLabScript16: ; 1cf12 (7:4f12) call MoveSprite ld a, $11 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript17: ; 1cfd4 (7:4fd4) @@ -639,12 +639,12 @@ OaksLabScript17: ; 1cfd4 (7:4fd4) ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a xor a ld [wJoyIgnore], a ld a, $12 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript18: ; 1d009 (7:5009) @@ -675,7 +675,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b) ld [$ffeb], a ld a, $8 ld [$ffee], a - ld a, [W_YCOORD] + ld a, [wYCoord] cp $3 jr nz, .asm_1d045 ld a, $4 @@ -695,7 +695,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b) ld a, $3 ld [wNPCMovementDirections2Index], a ld b, $a - ld a, [W_XCOORD] + ld a, [wXCoord] cp $4 jr nz, .asm_1d066 ld a, $40 @@ -714,9 +714,9 @@ OaksLabScript_1d02b: ; 1d02b (7:502b) OaksLabScript_1d076: ; 1d076 (7:5076) ld hl, OaksLabTextPointers + $36 ; starts at OaksLabText28 ld a, l - ld [W_MAPTEXTPTR], a + ld [wMapTextPtr], a ld a, h - ld [W_MAPTEXTPTR+1], a + ld [wMapTextPtr+1], a ret OaksLabTextPointers: ; 1d082 (7:5082) @@ -898,7 +898,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3) and a jr nz, OaksLabMonChoiceEnd ld a, [wcf91] - ld [W_PLAYERSTARTER], a + ld [wPlayerStarter], a ld [wd11e], a call GetMonName ld a, [wSpriteIndex] @@ -925,7 +925,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3) xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation], a ld a, 5 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, [wcf91] ld [wd11e], a call AddPartyMon @@ -934,7 +934,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3) ld a, $fc ld [wJoyIgnore], a ld a, $8 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a OaksLabMonChoiceEnd: ; 1d21f (7:521f) jp TextScriptEnd @@ -1013,7 +1013,7 @@ OaksLabText5: ; 1d248 (7:5248) call PrintText call OaksLabScript_RemoveParcel ld a, $f - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a jr .asm_1d2ed .asm_1d2c8 ld hl, OaksLabAroundWorldText diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index e4c3f135..60238845 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -5,7 +5,7 @@ PalletTownScript: ; 18e5b (6:4e5b) .next call EnableAutoTextBoxDrawing ld hl,PalletTownScriptPointers - ld a,[W_PALLETTOWNCURSCRIPT] + ld a,[wPalletTownCurScript] jp CallFunctionInTable PalletTownScriptPointers: ; 18e73 (6:4e73) @@ -20,7 +20,7 @@ PalletTownScriptPointers: ; 18e73 (6:4e73) PalletTownScript0: ; 18e81 (6:4e81) CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB ret nz - ld a,[W_YCOORD] + ld a,[wYCoord] cp 1 ; is player near north exit? ret nz xor a @@ -39,7 +39,7 @@ PalletTownScript0: ; 18e81 (6:4e81) ; trigger the next script ld a,1 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript1: ; 18eb2 (6:4eb2) @@ -56,7 +56,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2) ; trigger the next script ld a,2 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript2: ; 18ed2 (6:4ed2) @@ -67,7 +67,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) call SetSpriteFacingDirectionAndDelay call Delay3 ld a,1 - ld [W_YCOORD],a + ld [wYCoord],a ld a,1 ld [hNPCPlayerRelativePosPerspective],a ld a,1 @@ -86,7 +86,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ; trigger the next script ld a,3 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript3: ; 18f12 (6:4f12) @@ -116,7 +116,7 @@ PalletTownScript3: ; 18f12 (6:4f12) ; trigger the next script ld a,4 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript4: ; 18f4b (6:4f4b) @@ -126,7 +126,7 @@ PalletTownScript4: ; 18f4b (6:4f4b) ; trigger the next script ld a,5 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript5: ; 18f56 (6:4f56) diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 66589d52..28fa1cc3 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -1,7 +1,7 @@ PewterCityScript: ; 19237 (6:5237) call EnableAutoTextBoxDrawing ld hl, PewterCityScriptPointers - ld a, [W_PEWTERCITYCURSCRIPT] + ld a, [wPewterCityCurScript] jp CallFunctionInTable PewterCityScriptPointers: ; 19243 (6:5243) @@ -15,7 +15,7 @@ PewterCityScriptPointers: ; 19243 (6:5243) PewterCityScript0: ; 19251 (6:5251) xor a - ld [W_MUSEUM1FCURSCRIPT], a + ld [wMuseum1fCurScript], a ResetEvent EVENT_BOUGHT_MUSEUM_TICKET call PewterCityScript_1925e ret @@ -73,7 +73,7 @@ PewterCityScript1: ; 19280 (6:5280) ld de, MovementData_PewterMuseumGuyExit call MoveSprite ld a, $2 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret MovementData_PewterMuseumGuyExit: ; 192ce (6:52ce) @@ -91,7 +91,7 @@ PewterCityScript2: ; 192d3 (6:52d3) ld [wMissableObjectIndex], a predef HideObject ld a, $3 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript3: ; 192e9 (6:52e9) @@ -104,7 +104,7 @@ PewterCityScript3: ; 192e9 (6:52e9) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript4: ; 19305 (6:5305) @@ -141,7 +141,7 @@ PewterCityScript4: ; 19305 (6:5305) ld de, MovementData_PewterGymGuyExit call MoveSprite ld a, $5 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret MovementData_PewterGymGuyExit: ; 19353 (6:5353) @@ -160,7 +160,7 @@ PewterCityScript5: ; 19359 (6:5359) ld [wMissableObjectIndex], a predef HideObject ld a, $6 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript6: ; 1936f (6:536f) @@ -173,7 +173,7 @@ PewterCityScript6: ; 1936f (6:536f) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityTextPointers: ; 1938b (6:538b) @@ -226,7 +226,7 @@ PewterCityText3: ; 193b1 (6:53b1) ld [wSpriteIndex], a call GetSpritePosition2 ld a, $1 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a .asm_193ee jp TextScriptEnd @@ -290,7 +290,7 @@ PewterCityText5: ; 19436 (6:5436) ld [wSpriteIndex], a call GetSpritePosition2 ld a, $4 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a jp TextScriptEnd PewterCityText_1945d: ; 1945d (6:545d) diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 831403bb..58a74cd2 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -6,9 +6,9 @@ PewterGymScript: ; 5c387 (17:4387) call EnableAutoTextBoxDrawing ld hl, PewterGymTrainerHeaders ld de, PewterGymScriptPointers - ld a, [W_PEWTERGYMCURSCRIPT] + ld a, [wPewterGymCurScript] call ExecuteCurMapScriptInTable - ld [W_PEWTERGYMCURSCRIPT], a + ld [wPewterGymCurScript], a ret PewterGymScript_5c3a4: ; 5c3a4 (17:43a4) @@ -25,8 +25,8 @@ Gym1LeaderName: ; 5c3b9 (17:43b9) PewterGymScript_5c3bf: ; 5c3bf (17:43bf) xor a ld [wJoyIgnore], a - ld [W_PEWTERGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a ret PewterGymScriptPointers: ; 5c3ca (17:43ca) @@ -36,7 +36,7 @@ PewterGymScriptPointers: ; 5c3ca (17:43ca) dw PewterGymScript3 PewterGymScript3: ; 5c3d2 (17:43d2) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PewterGymScript_5c3bf ld a, $f0 @@ -60,7 +60,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c408 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 0, [hl] ld hl, wBeatGymFlags set 0, [hl] @@ -126,12 +126,12 @@ PewterGymText1: ; 5c44e (17:444e) call EngageMapTrainer call InitBattleEnemyParameters ld a, $1 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a xor a ld [hJoyHeld], a ld a, $3 - ld [W_PEWTERGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a .asm_5c49b jp TextScriptEnd diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index bee2b3b2..b33be016 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -1,14 +1,14 @@ PokemonTower2Script: ; 604f2 (18:44f2) call EnableAutoTextBoxDrawing ld hl, PokemonTower2ScriptPointers - ld a, [W_POKEMONTOWER2CURSCRIPT] + ld a, [wPokemonTower2CurScript] jp CallFunctionInTable PokemonTower2Script_604fe: ; 604fe (18:44fe) xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a ret PokemonTower2ScriptPointers: ; 60509 (18:4509) @@ -59,7 +59,7 @@ CoordsData_6055e: ; 6055e (18:455e) db $0F ; isn't this supposed to end in $ff? PokemonTower2Script1: ; 60563 (18:4563) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PokemonTower2Script_604fe ld a, $f0 @@ -81,8 +81,8 @@ PokemonTower2Script1: ; 60563 (18:4563) call PlaySound callba Music_RivalAlternateStart ld a, $2 - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a ret MovementData_605a9: ; 605a9 (18:45a9) @@ -118,8 +118,8 @@ PokemonTower2Script2: ; 605bb (18:45bb) ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a ret PokemonTower2TextPointers: ; 605db (18:45db) @@ -143,10 +143,10 @@ PokemonTower2Text1: ; 605df (18:45df) ld de, PokemonTower2Text_60637 call SaveEndBattleTextPointers ld a, OPP_SONY2 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $4 @@ -159,11 +159,11 @@ PokemonTower2Text1: ; 605df (18:45df) .Charmander ld a, $6 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a ld a, $1 - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a .asm_41852 jp TextScriptEnd diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index a4fbbf18..0c3c6639 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -2,9 +2,9 @@ PokemonTower3Script: ; 606cc (18:46cc) call EnableAutoTextBoxDrawing ld hl, PokemonTower3TrainerHeaders ld de, PokemonTower3ScriptPointers - ld a, [W_POKEMONTOWER3CURSCRIPT] + ld a, [wPokemonTower3CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER3CURSCRIPT], a + ld [wPokemonTower3CurScript], a ret PokemonTower3ScriptPointers: ; 606df (18:46df) diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm index 2638bdc2..bd4cda11 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/pokemontower4.asm @@ -2,9 +2,9 @@ PokemonTower4Script: ; 607f6 (18:47f6) call EnableAutoTextBoxDrawing ld hl, PokemonTower4TrainerHeaders ld de, PokemonTower4ScriptPointers - ld a, [W_POKEMONTOWER4CURSCRIPT] + ld a, [wPokemonTower4CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER4CURSCRIPT], a + ld [wPokemonTower4CurScript], a ret PokemonTower4ScriptPointers: ; 60809 (18:4809) diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index c4e9eed9..6a2f5758 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -2,9 +2,9 @@ PokemonTower5Script: ; 60932 (18:4932) call EnableAutoTextBoxDrawing ld hl, PokemonTower5TrainerHeaders ld de, PokemonTower5ScriptPointers - ld a, [W_POKEMONTOWER5CURSCRIPT] + ld a, [wPokemonTower5CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER5CURSCRIPT], a + ld [wPokemonTower5CurScript], a ret PokemonTower5ScriptPointers: ; 60945 (18:4945) diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index 37ca1b33..7bae81ea 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -2,16 +2,16 @@ PokemonTower6Script: ; 60aef (18:4aef) call EnableAutoTextBoxDrawing ld hl, PokemonTower6TrainerHeaders ld de, PokemonTower6ScriptPointers - ld a, [W_POKEMONTOWER6CURSCRIPT] + ld a, [wPokemonTower6CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER6CURSCRIPT], a + ld [wPokemonTower6CurScript], a ret PokemonTower6Script_60b02: ; 60b02 (18:4b02) xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6ScriptPointers: ; 60b0d (18:4b0d) @@ -33,19 +33,19 @@ PokemonTower6Script0: ; 60b17 (18:4b17) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, MAROWAK - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, 30 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, $4 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret CoordsData_60b45: ; 60b45 (18:4b45) db $10,$0A,$FF PokemonTower6Script4: ; 60b48 (18:4b48) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PokemonTower6Script_60b02 ld a, $ff @@ -66,8 +66,8 @@ PokemonTower6Script4: ; 60b48 (18:4b48) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret .asm_60b82 ld a, $1 @@ -80,8 +80,8 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ld hl, wd730 set 7, [hl] ld a, $3 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6Script3: ; 60ba1 (18:4ba1) @@ -90,8 +90,8 @@ PokemonTower6Script3: ; 60ba1 (18:4ba1) ret nz call Delay3 xor a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6TextPointers: ; 60bb1 (18:4bb1) diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index a4635aa3..0aebfec2 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -2,16 +2,16 @@ PokemonTower7Script: ; 60d05 (18:4d05) call EnableAutoTextBoxDrawing ld hl, PokemonTower7TrainerHeaders ld de, PokemonTower7ScriptPointers - ld a, [W_POKEMONTOWER7CURSCRIPT] + ld a, [wPokemonTower7CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER7CURSCRIPT], a + ld [wPokemonTower7CurScript], a ret PokemonTower7Script_60d18: ; 60d18 (18:4d18) xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a ret PokemonTower7ScriptPointers: @@ -24,7 +24,7 @@ PokemonTower7ScriptPointers: PokemonTower7Script2: ; 60d23 (18:4d23) ld hl, wFlags_0xcd60 res 0, [hl] - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PokemonTower7Script_60d18 call EndTrainerBattle @@ -35,15 +35,15 @@ PokemonTower7Script2: ; 60d23 (18:4d23) call DisplayTextID call PokemonTower7Script_60db6 ld a, $3 - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a ret PokemonTower7Script3: ; 60d56 (18:4d56) ld a, [wd730] bit 0, a ret nz - ld hl, W_MISSABLEOBJECTLIST + ld hl, wMissableObjectList ld a, [wSpriteIndex] ld b, a .missableObjectsListLoop @@ -59,8 +59,8 @@ PokemonTower7Script3: ; 60d56 (18:4d56) ld [wTrainerHeaderFlagBit], a ld [wUnusedDA38], a ld a, $0 - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a ret PokemonTower7Script4: ; 60d86 (18:4d86) @@ -80,8 +80,8 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld hl, wd72d set 3, [hl] ld a, $0 - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a ret PokemonTower7Script_60db6: ; 60db6 (18:4db6) @@ -92,9 +92,9 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6) ld d, $0 ld e, a add hl, de - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a .asm_60dcb ld a, [hli] @@ -268,8 +268,8 @@ PokemonTower7FujiText: ld [wMissableObjectIndex], a predef ShowObject ld a, $4 - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a jp TextScriptEnd TowerRescueFujiText: diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index 48f291e1..1470a091 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -2,9 +2,9 @@ PowerPlantScript: ; 1e2c6 (7:62c6) call EnableAutoTextBoxDrawing ld hl, PowerPlantTrainerHeaders ld de, PowerPlantScriptPointers - ld a, [W_POWERPLANTCURSCRIPT] + ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable - ld [W_POWERPLANTCURSCRIPT], a + ld [wPowerPlantCurScript], a ret PowerPlantScriptPointers: ; 1e2d9 (7:62d9) @@ -114,8 +114,8 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b) InitVoltorbBattle: ; 1e368 (7:6368) call TalkToTrainer - ld a, [W_CURMAPSCRIPT] - ld [W_POWERPLANTCURSCRIPT], a + ld a, [wCurMapScript] + ld [wPowerPlantCurScript], a jp TextScriptEnd PowerPlantText1: ; 1e374 (7:6374) diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm index 2335e6d1..352b7dea 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/redshouse2f.asm @@ -1,7 +1,7 @@ RedsHouse2FScript: ; 5c0b0 (17:40b0) call EnableAutoTextBoxDrawing ld hl,RedsHouse2FScriptPointers - ld a,[W_REDSHOUSE2CURSCRIPT] + ld a,[wRedsHouse2CurScript] jp CallFunctionInTable RedsHouse2FScriptPointers: ; 5c0bc (17:40bc) @@ -14,7 +14,7 @@ RedsHouse2FScript0: ; 5c0c0 (17:40c0) ld a,PLAYER_DIR_UP ld [wPlayerMovingDirection],a ld a,1 - ld [W_REDSHOUSE2CURSCRIPT],a + ld [wRedsHouse2CurScript],a ret RedsHouse2FScript1: ; 5c0ce (17:40ce) diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 82561577..7802c89f 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -3,9 +3,9 @@ RocketHideout1Script: ; 44bca (11:4bca) call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeaders ld de, RocketHideout1ScriptPointers - ld a, [W_ROCKETHIDEOUT1CURSCRIPT] + ld a, [wRocketHideout1CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT1CURSCRIPT], a + ld [wRocketHideout1CurScript], a ret RocketHideout1Script_44be0: ; 44be0 (11:4be0) diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index f269faef..db266be3 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -2,9 +2,9 @@ RocketHideout2Script: ; 44e27 (11:4e27) call EnableAutoTextBoxDrawing ld hl, RocketHideout2TrainerHeaders ld de, RocketHideout2ScriptPointers - ld a, [W_ROCKETHIDEOUT2CURSCRIPT] + ld a, [wRocketHideout2CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT2CURSCRIPT], a + ld [wRocketHideout2CurScript], a ret RocketHideout2ScriptPointers: ; 44e3a (11:4e3a) @@ -14,9 +14,9 @@ RocketHideout2ScriptPointers: ; 44e3a (11:4e3a) dw RocketHideout2Script3 RocketHideout2Script0: ; 44e42 (11:4e42) - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a ld hl, RocketHideout2ArrowTilePlayerMovement call DecodeArrowMovementRLE @@ -30,7 +30,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42) ld a, $ff ld [wJoyIgnore], a ld a, $3 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -310,7 +310,7 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2) ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) @@ -323,7 +323,7 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) add hl, bc ld a, [hl] ld [wSpriteStateData1 + 2], a - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp FACILITY ld hl, FacilitySpinnerArrows jr z, .asm_44ff6 diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index 1f6d5b41..82bdd394 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -2,9 +2,9 @@ RocketHideout3Script: ; 45225 (11:5225) call EnableAutoTextBoxDrawing ld hl, RocketHideout3TrainerHeaders ld de, RocketHideout3ScriptPointers - ld a, [W_ROCKETHIDEOUT3CURSCRIPT] + ld a, [wRocketHideout3CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT3CURSCRIPT], a + ld [wRocketHideout3CurScript], a ret RocketHideout3ScriptPointers: ; 45238 (11:5238) @@ -14,9 +14,9 @@ RocketHideout3ScriptPointers: ; 45238 (11:5238) dw RocketHideout3Script3 RocketHideout3Script0: ; 45240 (11:5240) - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a ld hl, RocketHideout3ArrowTilePlayerMovement call DecodeArrowMovementRLE @@ -30,7 +30,7 @@ RocketHideout3Script0: ; 45240 (11:5240) ld a, $ff ld [wJoyIgnore], a ld a, $3 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -140,7 +140,7 @@ RocketHideout3Script3: ; 452e4 (11:452e4) ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret RocketHideout3TextPointers: ; 452fa (11:52fa) diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index a71e444c..23b8c791 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -3,9 +3,9 @@ RocketHideout4Script: ; 4545d (11:545d) call EnableAutoTextBoxDrawing ld hl, RocketHideout4TrainerHeader0 ld de, RocketHideout4ScriptPointers - ld a, [W_ROCKETHIDEOUT4CURSCRIPT] + ld a, [wRocketHideout4CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT4CURSCRIPT], a + ld [wRocketHideout4CurScript], a ret RocketHideout4Script_45473: ; 45473 (11:5473) @@ -33,8 +33,8 @@ RocketHideout4Script_45473: ; 45473 (11:5473) RocketHideout4Script_454a3: ; 454a3 (11:54a3) xor a ld [wJoyIgnore], a - ld [W_ROCKETHIDEOUT4CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRocketHideout4CurScript], a + ld [wCurMapScript], a ret RocketHideout4ScriptPointers: ; 454ae (11:54ae)c @@ -44,7 +44,7 @@ RocketHideout4ScriptPointers: ; 454ae (11:54ae)c dw RocketHideout4Script3 RocketHideout4Script3: ; 454b6 (11:54b6) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, RocketHideout4Script_454a3 call UpdateSprites @@ -68,8 +68,8 @@ RocketHideout4Script3: ; 454b6 (11:54b6) ld hl, wd126 set 5, [hl] ld a, $0 - ld [W_ROCKETHIDEOUT4CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRocketHideout4CurScript], a + ld [wCurMapScript], a ret RocketHideout4TextPointers: ; 45501 (11:5501) @@ -133,8 +133,8 @@ RocketHideout4Text1: ; 4553a (11:553a) xor a ld [hJoyHeld], a ld a, $3 - ld [W_ROCKETHIDEOUT4CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRocketHideout4CurScript], a + ld [wCurMapScript], a jr .asm_209f0 .asm_545571 ld hl, RocketHideout4Text10 diff --git a/scripts/rocktunnel1.asm b/scripts/rocktunnel1.asm index d03a5ba1..2b917f91 100755 --- a/scripts/rocktunnel1.asm +++ b/scripts/rocktunnel1.asm @@ -2,9 +2,9 @@ RockTunnel1Script: ; 444dc (11:44dc) call EnableAutoTextBoxDrawing ld hl, RockTunnel1TrainerHeaders ld de, RockTunnel1ScriptPointers - ld a, [W_ROCKTUNNEL1CURSCRIPT] + ld a, [wRockTunnel1CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKTUNNEL1CURSCRIPT], a + ld [wRockTunnel1CurScript], a ret RockTunnel1ScriptPointers: ; 444ef (11:44ef) diff --git a/scripts/rocktunnel2.asm b/scripts/rocktunnel2.asm index 2082394a..5cc04a2d 100755 --- a/scripts/rocktunnel2.asm +++ b/scripts/rocktunnel2.asm @@ -2,9 +2,9 @@ RockTunnel2Script: ; 45feb (11:5feb) call EnableAutoTextBoxDrawing ld hl, RockTunnel2TrainerHeaders ld de, RockTunnel2ScriptPointers - ld a, [W_ROCKTUNNEL2CURSCRIPT] + ld a, [wRockTunnel2CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKTUNNEL2CURSCRIPT], a + ld [wRockTunnel2CurScript], a ret RockTunnel2ScriptPointers: ; 45ffe (11:5ffe) diff --git a/scripts/route10.asm b/scripts/route10.asm index 2d5d2ae4..5a501557 100755 --- a/scripts/route10.asm +++ b/scripts/route10.asm @@ -2,9 +2,9 @@ Route10Script: ; 59336 (16:5336) call EnableAutoTextBoxDrawing ld hl, Route10TrainerHeaders ld de, Route10ScriptPointers - ld a, [W_ROUTE10CURSCRIPT] + ld a, [wRoute10CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE10CURSCRIPT], a + ld [wRoute10CurScript], a ret Route10ScriptPointers: ; 59349 (16:5349) diff --git a/scripts/route11.asm b/scripts/route11.asm index 3a9f1e0d..d56b7730 100755 --- a/scripts/route11.asm +++ b/scripts/route11.asm @@ -2,9 +2,9 @@ Route11Script: ; 5944c (16:544c) call EnableAutoTextBoxDrawing ld hl, Route11TrainerHeaders ld de, Route11ScriptPointers - ld a, [W_ROUTE11CURSCRIPT] + ld a, [wRoute11CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE11CURSCRIPT], a + ld [wRoute11CurScript], a ret Route11ScriptPointers: ; 5945f (16:545f) diff --git a/scripts/route12.asm b/scripts/route12.asm index 4057ce03..882e687a 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -2,16 +2,16 @@ Route12Script: ; 595f3 (16:55f3) call EnableAutoTextBoxDrawing ld hl, Route12TrainerHeaders ld de, Route12ScriptPointers - ld a, [W_ROUTE12CURSCRIPT] + ld a, [wRoute12CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE12CURSCRIPT], a + ld [wRoute12CurScript], a ret Route12Script_59606: ; 59606 (16:5606) xor a ld [wJoyIgnore], a - ld [W_ROUTE12CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute12CurScript], a + ld [wCurMapScript], a ret Route12ScriptPointers: ; 59611 (16:5611) @@ -30,19 +30,19 @@ Route12Script0: ; 59619 (16:5619) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, 30 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, HS_ROUTE_12_SNORLAX ld [wMissableObjectIndex], a predef HideObject ld a, $3 - ld [W_ROUTE12CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute12CurScript], a + ld [wCurMapScript], a ret Route12Script3: ; 5964c (16:564c) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jr z, Route12Script_59606 call UpdateSprites @@ -56,8 +56,8 @@ Route12Script3: ; 5964c (16:564c) SetEvent EVENT_BEAT_ROUTE12_SNORLAX call Delay3 ld a, $0 - ld [W_ROUTE12CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute12CurScript], a + ld [wCurMapScript], a ret Route12TextPointers: ; 59675 (16:5675) diff --git a/scripts/route13.asm b/scripts/route13.asm index ab061071..911c15af 100755 --- a/scripts/route13.asm +++ b/scripts/route13.asm @@ -2,9 +2,9 @@ Route13Script: ; 5581e (15:581e) call EnableAutoTextBoxDrawing ld hl, Route13TrainerHeaders ld de, Route13ScriptPointers - ld a, [W_ROUTE13CURSCRIPT] + ld a, [wRoute13CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE13CURSCRIPT], a + ld [wRoute13CurScript], a ret Route13ScriptPointers: ; 55831 (15:5831) diff --git a/scripts/route14.asm b/scripts/route14.asm index d65e257f..9970b817 100755 --- a/scripts/route14.asm +++ b/scripts/route14.asm @@ -2,9 +2,9 @@ Route14Script: ; 559d3 (15:59d3) call EnableAutoTextBoxDrawing ld hl, Route14TrainerHeaders ld de, Route14ScriptPointers - ld a, [W_ROUTE14CURSCRIPT] + ld a, [wRoute14CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE14CURSCRIPT], a + ld [wRoute14CurScript], a ret Route14ScriptPointers: ; 559e6 (15:59e6) diff --git a/scripts/route15.asm b/scripts/route15.asm index 023f859c..5f58b996 100755 --- a/scripts/route15.asm +++ b/scripts/route15.asm @@ -2,9 +2,9 @@ Route15Script: ; 597ae (16:57ae) call EnableAutoTextBoxDrawing ld hl, Route15TrainerHeaders ld de, Route15ScriptPointers - ld a, [W_ROUTE15CURSCRIPT] + ld a, [wRoute15CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE15CURSCRIPT], a + ld [wRoute15CurScript], a ret Route15ScriptPointers: ; 597c1 (16:57c1) diff --git a/scripts/route16.asm b/scripts/route16.asm index c762c999..1f6ba9a3 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -2,16 +2,16 @@ Route16Script: ; 59933 (16:5933) call EnableAutoTextBoxDrawing ld hl, Route16TrainerHeaders ld de, Route16ScriptPointers - ld a, [W_ROUTE16CURSCRIPT] + ld a, [wRoute16CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE16CURSCRIPT], a + ld [wRoute16CurScript], a ret Route16Script_59946: ; 59946 (16:5946) xor a ld [wJoyIgnore], a - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16ScriptPointers: ; 59951 (16:5951) @@ -30,20 +30,20 @@ Route16Script0: ; 59959 (16:5959) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, 30 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, HS_ROUTE_16_SNORLAX ld [wMissableObjectIndex], a predef HideObject call UpdateSprites ld a, $3 - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16Script3: ; 5998f (16:598f) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route16Script_59946 call UpdateSprites @@ -57,8 +57,8 @@ Route16Script3: ; 5998f (16:598f) SetEvent EVENT_BEAT_ROUTE16_SNORLAX call Delay3 ld a, $0 - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16TextPointers: ; 599b9 (16:59b9) diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index 801e577e..4bfef638 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -2,7 +2,7 @@ Route16GateScript: ; 496be (12:56be) ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [W_ROUTE16GATECURSCRIPT] + ld a, [wRoute16GateCurScript] ld hl, Route16GateScriptPointers jp CallFunctionInTable @@ -36,11 +36,11 @@ Route16GateScript0: ; 496d7 (12:56d7) call FillMemory call StartSimulatingJoypadStates ld a, $1 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret .asm_4970e ld a, $2 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret CoordsData_49714: ; 49714 (12:5714) @@ -67,7 +67,7 @@ Route16GateScript2: ; 49727 (12:5727) ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret Route16GateScript3: ; 49741 (12:5741) @@ -79,7 +79,7 @@ Route16GateScript3: ; 49741 (12:5741) ld hl, wd730 res 7, [hl] ld a, $0 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret Route16GateScript_49755: ; 49755 (12:5755) diff --git a/scripts/route17.asm b/scripts/route17.asm index 28c43627..f2a021a7 100755 --- a/scripts/route17.asm +++ b/scripts/route17.asm @@ -2,9 +2,9 @@ Route17Script: ; 55b7a (15:5b7a) call EnableAutoTextBoxDrawing ld hl, Route17TrainerHeaders ld de, Route17ScriptPointers - ld a, [W_ROUTE17CURSCRIPT] + ld a, [wRoute17CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE17CURSCRIPT], a + ld [wRoute17CurScript], a ret Route17ScriptPointers: ; 55b8d (15:5b8d) diff --git a/scripts/route18.asm b/scripts/route18.asm index 9a077faf..dcd4b5ee 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -2,9 +2,9 @@ Route18Script: ; 59ac7 (16:5ac7) call EnableAutoTextBoxDrawing ld hl, Route18TrainerHeaders ld de, Route18ScriptPointers - ld a, [W_ROUTE18CURSCRIPT] + ld a, [wRoute18CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE18CURSCRIPT], a + ld [wRoute18CurScript], a ret Route18ScriptPointers: ; 59ada (16:5ada) diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index 060a6bbf..c5462686 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -2,7 +2,7 @@ Route18GateScript: ; 49876 (12:5876) ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [W_ROUTE18GATECURSCRIPT] + ld a, [wRoute18GateCurScript] ld hl, Route18GateScriptPointers jp CallFunctionInTable @@ -36,11 +36,11 @@ Route18GateScript0: ; 4988f (12:588f) call FillMemory call StartSimulatingJoypadStates ld a, $1 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret .asm_498c6 ld a, $2 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret CoordsData_498cc: ; 498cc (12:58cc) @@ -67,7 +67,7 @@ Route18GateScript2: ; 498df (12:58df) ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret Route18GateScript3: ; 498f9 (12:58f9) @@ -79,7 +79,7 @@ Route18GateScript3: ; 498f9 (12:58f9) ld hl, wd730 res 7, [hl] ld a, $0 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret Route18GateTextPointers: ; 4990d (12:590d) diff --git a/scripts/route19.asm b/scripts/route19.asm index 4a60e40f..c6aa214e 100755 --- a/scripts/route19.asm +++ b/scripts/route19.asm @@ -2,9 +2,9 @@ Route19Script: ; 55d44 (15:5d44) call EnableAutoTextBoxDrawing ld hl, Route19TrainerHeaders ld de, Route19ScriptPointers - ld a, [W_ROUTE19CURSCRIPT] + ld a, [wRoute19CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE19CURSCRIPT], a + ld [wRoute19CurScript], a ret Route19ScriptPointers: ; 55d57 (15:5d57) diff --git a/scripts/route20.asm b/scripts/route20.asm index ce9e6f23..9c5fc387 100755 --- a/scripts/route20.asm +++ b/scripts/route20.asm @@ -4,9 +4,9 @@ Route20Script: ; 50ca9 (14:4ca9) call EnableAutoTextBoxDrawing ld hl, Route20TrainerHeader0 ld de, Route20ScriptPointers - ld a, [W_ROUTE20CURSCRIPT] + ld a, [wRoute20CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE20CURSCRIPT], a + ld [wRoute20CurScript], a ret Route20Script_50cc6: ; 50cc6 (14:4cc6) diff --git a/scripts/route21.asm b/scripts/route21.asm index 4c8087fd..821cea39 100755 --- a/scripts/route21.asm +++ b/scripts/route21.asm @@ -2,9 +2,9 @@ Route21Script: ; 55eeb (15:5eeb) call EnableAutoTextBoxDrawing ld hl, Route21TrainerHeaders ld de, Route21ScriptPointers - ld a, [W_ROUTE21CURSCRIPT] + ld a, [wRoute21CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE21CURSCRIPT], a + ld [wRoute21CurScript], a ret Route21ScriptPointers: ; 55efe (15:5efe) diff --git a/scripts/route22.asm b/scripts/route22.asm index 1244f0ff..81da41a1 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -1,7 +1,7 @@ Route22Script: ; 50eb2 (14:4eb2) call EnableAutoTextBoxDrawing ld hl, Route22ScriptPointers - ld a, [W_ROUTE22CURSCRIPT] + ld a, [wRoute22CurScript] jp CallFunctionInTable Route22ScriptPointers: ; 50ebe (14:4ebe) @@ -17,12 +17,12 @@ Route22ScriptPointers: ; 50ebe (14:4ebe) Route22Script_50ece: ; 50ece (14:4ece) xor a ld [wJoyIgnore], a - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a Route22Script7: ; 50ed5 (14:4ed5) ret Route22Script_50ed6: ; 50ed6 (14:4ed6) - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] ld b, a .asm_50eda ld a, [hli] @@ -32,7 +32,7 @@ Route22Script_50ed6: ; 50ed6 (14:4ed6) jr .asm_50eda .asm_50ee1 ld a, [hl] - ld [W_TRAINERNO], a + ld [wTrainerNo], a ret Route22MoveRivalSprite: ; 50ee6 (14:4ee6) @@ -99,7 +99,7 @@ Route22Script0: ; 50f00 (14:4f00) ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $1 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script1: ; 50f62 (14:4f62) @@ -132,11 +132,11 @@ Route22Script1: ; 50f62 (14:4f62) ld de, Route22Text_511bc call SaveEndBattleTextPointers ld a, OPP_SONY1 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld hl, StarterMons_50faf call Route22Script_50ed6 ld a, $2 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret StarterMons_50faf: ; 50faf (14:4faf) @@ -146,7 +146,7 @@ StarterMons_50faf: ; 50faf (14:4faf) db STARTER1,$06 Route22Script2: ; 50fb5 (14:4fb5) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece ld a, [wSpriteStateData1 + 9] @@ -180,7 +180,7 @@ Route22Script2: ; 50fb5 (14:4fb5) call Route22Script_5100d .asm_51002 ld a, $3 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_51008: ; 51008 (14:5008) @@ -229,7 +229,7 @@ Route22Script3: ; 5102a (14:502a) call PlayDefaultMusic ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE ld a, $0 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_5104e: ; 5104e (14:504e) @@ -253,7 +253,7 @@ Route22Script_5104e: ; 5104e (14:504e) ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $4 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script4: ; 51087 (14:5087) @@ -288,11 +288,11 @@ Route22Script4: ; 51087 (14:5087) ld de, Route22Text_511d0 call SaveEndBattleTextPointers ld a, OPP_SONY2 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld hl, StarterMons_510d9 call Route22Script_50ed6 ld a, $5 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret StarterMons_510d9: ; 510d9 (14:50d9) @@ -301,7 +301,7 @@ StarterMons_510d9: ; 510d9 (14:50d9) db STARTER1,$0c Route22Script5: ; 510df (14:50df) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece ld a, $2 @@ -339,7 +339,7 @@ Route22Script5: ; 510df (14:50df) call Route22Script_51142 .asm_51137 ld a, $6 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_5113d: ; 5113d (14:513d) @@ -374,7 +374,7 @@ Route22Script6: ; 51151 (14:5151) call PlayDefaultMusic ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE ld a, $7 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22TextPointers: ; 51175 (14:5175) diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 95546a99..53ae8378 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -1,9 +1,9 @@ Route22GateScript: ; 1e683 (7:6683) call EnableAutoTextBoxDrawing ld hl, Route22GateScriptPointers - ld a, [W_ROUTE22GATECURSCRIPT] + ld a, [wRoute22GateCurScript] call CallFunctionInTable - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ld a, ROUTE_23 jr c, .asm_1e69a @@ -49,7 +49,7 @@ Route22GateScript1: ; 1e6cd (7:66cd) ld [wJoyIgnore], a call Delay3 ld a, $0 - ld [W_ROUTE22GATECURSCRIPT], a + ld [wRoute22GateCurScript], a Route22GateScript2: ; 1e6de (7:66de) ret @@ -58,7 +58,7 @@ Route22GateTextPointers: ; 1e6df (7:66df) Route22GateText1: ; 1e6e1 (7:66e1) TX_ASM - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] bit 0, a jr nz, .asm_1e6f6 ld hl, Route22GateText_1e704 @@ -71,7 +71,7 @@ Route22GateText1: ; 1e6e1 (7:66e1) call PrintText ld a, $2 .asm_1e6fe - ld [W_ROUTE22GATECURSCRIPT], a + ld [wRoute22GateCurScript], a jp TextScriptEnd Route22GateText_1e704: ; 1e704 (7:6704) diff --git a/scripts/route23.asm b/scripts/route23.asm index 35f1b9cb..10bae669 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -2,7 +2,7 @@ Route23Script: ; 511da (14:51da) call Route23Script_511e9 call EnableAutoTextBoxDrawing ld hl, Route23ScriptPointers - ld a, [W_ROUTE23CURSCRIPT] + ld a, [wRoute23CurScript] jp CallFunctionInTable Route23Script_511e9: ; 511e9 (14:51e9) @@ -26,7 +26,7 @@ Route23ScriptPointers: ; 51213 (14:5213) Route23Script0: ; 51219 (14:5219) ld hl, YCoordsData_51255 - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a ld e, $0 EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK @@ -40,7 +40,7 @@ Route23Script0: ; 51219 (14:5219) jr nz, .asm_51224 cp $23 jr nz, .asm_51237 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $e ret nc .asm_51237 @@ -128,7 +128,7 @@ Route23Script1: ; 512ec (14:52ec) ret nz Route23Script2: ; 512f1 (14:52f1) ld a, $0 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret Route23TextPointers: ; 512f7 (14:52f7) @@ -190,7 +190,7 @@ Route23Script_51346: ; 51346 (14:5346) inc a ld c, a ld b, FLAG_TEST - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges predef FlagActionPredef ld a, c and a @@ -199,7 +199,7 @@ Route23Script_51346: ; 51346 (14:5346) call PrintText call Route23Script_512d8 ld a, $1 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret .asm_5136e ld hl, VictoryRoadGuardText2 @@ -210,7 +210,7 @@ Route23Script_51346: ; 51346 (14:5346) EventFlagAddress hl, EVENT_PASSED_CASCADEBADGE_CHECK predef FlagActionPredef ld a, $2 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret Route23Script_51388: ; 51388 (14:5388) diff --git a/scripts/route24.asm b/scripts/route24.asm index 6eba1d35..02b439e1 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -2,16 +2,16 @@ Route24Script: ; 513ad (14:53ad) call EnableAutoTextBoxDrawing ld hl, Route24TrainerHeaders ld de, Route24ScriptPointers - ld a, [W_ROUTE24CURSCRIPT] + ld a, [wRoute24CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE24CURSCRIPT], a + ld [wRoute24CurScript], a ret Route24Script_513c0: ; 513c0 (14:53c0) xor a ld [wJoyIgnore], a - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24ScriptPointers: ; 513cb (14:53cb) @@ -40,8 +40,8 @@ Route24Script0: ; 513d5 (14:53d5) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $4 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret CoordsData_5140e: ; 5140e (14:540e) @@ -53,12 +53,12 @@ Route24Script4: ; 51411 (14:5411) ret nz call Delay3 ld a, $0 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24Script3: ; 51422 (14:5422) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route24Script_513c0 call UpdateSprites @@ -71,8 +71,8 @@ Route24Script3: ; 51422 (14:5422) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24TextPointers: ; 5144b (14:544b) @@ -170,8 +170,8 @@ Route24Text1: ; 514a4 (14:54a4) xor a ld [hJoyHeld], a ld a, $3 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a jp TextScriptEnd .asm_514f9 ld hl, Route24Text_51530 diff --git a/scripts/route25.asm b/scripts/route25.asm index 49580ba6..4df7fd40 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -3,9 +3,9 @@ Route25Script: ; 515cb (14:55cb) call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeaders ld de, Route25ScriptPointers - ld a, [W_ROUTE25CURSCRIPT] + ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE25CURSCRIPT], a + ld [wRoute25CurScript], a ret Route25Script_515e1: ; 515e1 (14:55e1) diff --git a/scripts/route3.asm b/scripts/route3.asm index 50c4e00d..4640d767 100755 --- a/scripts/route3.asm +++ b/scripts/route3.asm @@ -2,9 +2,9 @@ Route3Script: ; 554f8 (15:54f8) call EnableAutoTextBoxDrawing ld hl, Route3TrainerHeader0 ld de, Route3ScriptPointers - ld a, [W_ROUTE3CURSCRIPT] + ld a, [wRoute3CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE3CURSCRIPT], a + ld [wRoute3CurScript], a ret Route3ScriptPointers: ; 5550b (15:550b) diff --git a/scripts/route4.asm b/scripts/route4.asm index f5bdd9e8..019d5582 100755 --- a/scripts/route4.asm +++ b/scripts/route4.asm @@ -2,9 +2,9 @@ Route4Script: ; 55658 (15:5658) call EnableAutoTextBoxDrawing ld hl, Route4TrainerHeaders ld de, Route4ScriptPointers - ld a, [W_ROUTE4CURSCRIPT] + ld a, [wRoute4CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE4CURSCRIPT], a + ld [wRoute4CurScript], a ret Route4ScriptPointers: ; 5566b (15:566b) diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 35f3a020..d1b85dff 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -1,6 +1,6 @@ Route5GateScript: ; 1df33 (7:5f33) call EnableAutoTextBoxDrawing - ld a, [W_ROUTE5GATECURSCRIPT] + ld a, [wRoute5GateCurScript] ld hl, Route5GateScriptPointers jp CallFunctionInTable @@ -35,7 +35,7 @@ Route5GateScript0: ; 1df50 (7:5f50) call DisplayTextID call Route5GateScript_1df43 ld a, $1 - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a ret .asm_1df82 ld a, $3 @@ -57,7 +57,7 @@ Route5GateScript1: ; 1df94 (7:5f94) call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a ret Route5GateTextPointers: ; 1dfa4 (7:5fa4) @@ -81,7 +81,7 @@ Route5GateText1: ; 1dfaa (7:5faa) call PrintText call Route5GateScript_1df43 ld a, $1 - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a jp TextScriptEnd .asm_768a2 ld hl, Route5GateText3 diff --git a/scripts/route6.asm b/scripts/route6.asm index e748fed1..cb2b5e65 100755 --- a/scripts/route6.asm +++ b/scripts/route6.asm @@ -2,9 +2,9 @@ Route6Script: ; 590b0 (16:50b0) call EnableAutoTextBoxDrawing ld hl, Route6TrainerHeaders ld de, Route6ScriptPointers - ld a, [W_ROUTE6CURSCRIPT] + ld a, [wRoute6CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE6CURSCRIPT], a + ld [wRoute6CurScript], a ret Route6ScriptPointers: ; 590c3 (16:50c3) diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index a4b6149c..4d3d94d3 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -1,7 +1,7 @@ Route6GateScript: ; 1e03d (7:603d) call EnableAutoTextBoxDrawing ld hl, Route6GateScriptPointers - ld a, [W_ROUTE6GATECURSCRIPT] + ld a, [wRoute6GateCurScript] call CallFunctionInTable ret @@ -29,7 +29,7 @@ Route6GateScript0: ; 1e04e (7:604e) call DisplayTextID call Route6GateScript_1e0a1 ld a, $1 - ld [W_ROUTE6GATECURSCRIPT], a + ld [wRoute6GateCurScript], a ret .asm_1e080 ld hl, wd728 @@ -49,7 +49,7 @@ Route6GateScript1: ; 1e091 (7:6091) call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE6GATECURSCRIPT], a + ld [wRoute6GateCurScript], a ret Route6GateScript_1e0a1: ; 1e0a1 (7:60a1) diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm index b55f813c..af10ccb5 100755 --- a/scripts/route7gate.asm +++ b/scripts/route7gate.asm @@ -1,6 +1,6 @@ Route7GateScript: ; 1e100 (7:6100) call EnableAutoTextBoxDrawing - ld a, [W_ROUTE7GATECURSCRIPT] + ld a, [wRoute7GateCurScript] ld hl, Route7GateScriptPointers call CallFunctionInTable ret @@ -41,7 +41,7 @@ Route7GateScript0: ; 1e128 (7:6128) call DisplayTextID call Route7GateScript_1e111 ld a, $1 - ld [W_ROUTE7GATECURSCRIPT], a + ld [wRoute7GateCurScript], a ret .asm_1e15a ld a, $3 @@ -63,8 +63,8 @@ Route7GateScript1: ; 1e16c (7:616c) call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE7GATECURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute7GateCurScript], a + ld [wCurMapScript], a ret Route7GateTextPointers: ; 1e17f (7:617f) diff --git a/scripts/route8.asm b/scripts/route8.asm index c734c62d..cfb4f433 100755 --- a/scripts/route8.asm +++ b/scripts/route8.asm @@ -2,9 +2,9 @@ Route8Script: ; 591b6 (16:51b6) call EnableAutoTextBoxDrawing ld hl, Route8TrainerHeaders ld de, Route8ScriptPointers - ld a, [W_ROUTE8CURSCRIPT] + ld a, [wRoute8CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE8CURSCRIPT], a + ld [wRoute8CurScript], a ret Route8ScriptPointers: ; 591c9 (16:51c9) diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index 96bfa875..141c5f4d 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -1,7 +1,7 @@ Route8GateScript: ; 1e1c7 (7:61c7) call EnableAutoTextBoxDrawing ld hl, Route8GateScriptPointers - ld a, [W_ROUTE8GATECURSCRIPT] + ld a, [wRoute8GateCurScript] jp CallFunctionInTable Route8GateScriptPointers: ; 1e1d3 (7:61d3) @@ -40,7 +40,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) call DisplayTextID call Route8GateScript_1e1d7 ld a, $1 - ld [W_ROUTE8GATECURSCRIPT], a + ld [wRoute8GateCurScript], a ret .asm_1e220 ld hl, wd728 @@ -61,7 +61,7 @@ Route8GateScript1: ; 1e231 (7:6231) call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE8GATECURSCRIPT], a + ld [wRoute8GateCurScript], a ret Route8GateTextPointers: ; 1e241 (7:6241) diff --git a/scripts/route9.asm b/scripts/route9.asm index 9d26ee96..6656cc8a 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -2,9 +2,9 @@ Route9Script: ; 556bc (15:56bc) call EnableAutoTextBoxDrawing ld hl, Route9TrainerHeaders ld de, Route9ScriptPointers - ld a, [W_ROUTE9CURSCRIPT] + ld a, [wRoute9CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE9CURSCRIPT], a + ld [wRoute9CurScript], a ret Route9ScriptPointers: ; 556cf (15:56cf) diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm index 4a37f0e6..da9a068e 100644 --- a/scripts/safarizoneentrance-yellow.asm +++ b/scripts/safarizoneentrance-yellow.asm @@ -56,7 +56,7 @@ ld a,30 lb hl, (502 / $100), (502 % $100) .xf1ff2 - ld [W_NUMSAFARIBALLS],a + ld [wNumSafariBalls],a ld a,h ld [wSafariSteps],a ld a,l @@ -67,7 +67,7 @@ SetEvent EVENT_IN_SAFARI_ZONE ResetEventReuseHL EVENT_SAFARI_GAME_OVER ld a,3 - ld [W_SAFARIZONEENTRANCECURSCRIPT],a + ld [wSafariZoneEntranceCurScript],a jr .done .PleaseComeAgain @@ -78,7 +78,7 @@ ld c,1 call SafariZoneEntranceAutoWalk ld a,4 - ld [W_SAFARIZONEENTRANCECURSCRIPT],a + ld [wSafariZoneEntranceCurScript],a .done ret diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index e4e2e2a8..2f8ff34b 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -1,7 +1,7 @@ SafariZoneEntranceScript: ; 751cd (1d:51cd) call EnableAutoTextBoxDrawing ld hl, SafariZoneEntranceScriptPointers - ld a, [W_SAFARIZONEENTRANCECURSCRIPT] + ld a, [wSafariZoneEntranceCurScript] jp CallFunctionInTable SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) @@ -30,7 +30,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) cp $1 jr z, .asm_7520f ld a, $2 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret .asm_7520f ld a, D_RIGHT @@ -39,7 +39,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld a, $f0 ld [wJoyIgnore], a ld a, $1 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret .CoordsData_75221: ; 75221 (1d:5221) @@ -68,7 +68,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) xor a ld [wJoyIgnore], a ld a, $5 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret .SafariZoneEntranceScript5 @@ -84,12 +84,12 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [W_NUMSAFARIBALLS], a + ld [wNumSafariBalls], a ld a, D_DOWN ld c, $3 call SafariZoneEntranceAutoWalk ld a, $4 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a jr .asm_75286 .asm_7527f ld a, $5 @@ -104,7 +104,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret .SafariZoneEntranceScript6 @@ -112,7 +112,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ret nz call Delay3 ld a, [wcf0d] - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret SafariZoneEntranceAutoWalk: @@ -181,7 +181,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) ld hl,.MakePaymentText call PrintText ld a,30 - ld [W_NUMSAFARIBALLS],a + ld [wNumSafariBalls],a ld a,502 / $100 ld [wSafariSteps],a ld a, 502 % $100 @@ -192,7 +192,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) SetEvent EVENT_IN_SAFARI_ZONE ResetEventReuseHL EVENT_SAFARI_GAME_OVER ld a,3 - ld [W_SAFARIZONEENTRANCECURSCRIPT],a + ld [wSafariZoneEntranceCurScript],a jr .done .PleaseComeAgain @@ -203,7 +203,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) ld c,1 call SafariZoneEntranceAutoWalk ld a,4 - ld [W_SAFARIZONEENTRANCECURSCRIPT],a + ld [wSafariZoneEntranceCurScript],a .done jp TextScriptEnd @@ -251,7 +251,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) ld [wcf0d], a .asm_753b3 ld a, $6 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a jp TextScriptEnd .SafariZoneEntranceText_753bb diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 140b1130..54aea876 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -6,9 +6,9 @@ SaffronGymScript: ; 5d00d (17:500d) call EnableAutoTextBoxDrawing ld hl, SaffronGymTrainerHeader0 ld de, SaffronGymScriptPointers - ld a, [W_SAFFRONGYMCURSCRIPT] + ld a, [wSaffronGymCurScript] call ExecuteCurMapScriptInTable - ld [W_SAFFRONGYMCURSCRIPT], a + ld [wSaffronGymCurScript], a ret .extra @@ -25,8 +25,8 @@ Gym6LeaderName: ; 5d040 (17:5040) SaffronGymText_5d048: ; 5d048 (17:5048) xor a ld [wJoyIgnore], a - ld [W_SAFFRONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSaffronGymCurScript], a + ld [wCurMapScript], a ret SaffronGymScriptPointers: ; 5d053 (17:5053) @@ -36,7 +36,7 @@ SaffronGymScriptPointers: ; 5d053 (17:5053) dw SaffronGymScript3 SaffronGymScript3: ; 5d05b (17:505b) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SaffronGymText_5d048 ld a, $f0 @@ -60,7 +60,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5d091 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 5, [hl] ld hl, wBeatGymFlags set 5, [hl] @@ -177,9 +177,9 @@ SaffronGymText1: ; 5d118 (17:5118) call EngageMapTrainer call InitBattleEnemyParameters ld a, $6 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a ld a, $3 - ld [W_SAFFRONGYMCURSCRIPT], a + ld [wSaffronGymCurScript], a .asm_5d15f jp TextScriptEnd diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index f7407e48..e3234b0a 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -41,7 +41,7 @@ SeafoamIslands4Script: ; 4658d (11:658d) ret nz .asm_465ed ld hl, SeafoamIslands4ScriptPointers - ld a, [W_SEAFOAMISLANDS4CURSCRIPT] + ld a, [wSeafoamIslands4CurScript] jp CallFunctionInTable Seafoam4HolesCoords: ; 465f6 (11:65f6) @@ -58,10 +58,10 @@ SeafoamIslands4ScriptPointers: ; 465fb (11:65fb) SeafoamIslands4Script0: ; 46603 (11:6603) CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $f ret nz ld hl, wSimulatedJoypadStatesEnd @@ -70,10 +70,10 @@ SeafoamIslands4Script0: ; 46603 (11:6603) dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 2, [hl] ld a, $1 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret RLEMovement46632: ; 46632 (11:6632) @@ -87,13 +87,13 @@ SeafoamIslands4Script1: ; 46639 (11:6639) and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret SeafoamIslands4Script2: ; 46644 (11:6644) CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld a, [W_XCOORD] + ld a, [wXCoord] cp $12 jr z, .asm_4665e cp $13 @@ -112,11 +112,11 @@ SeafoamIslands4Script2: ; 46644 (11:6644) ld [wSpriteStateData2 + $06], a ld hl, wd730 set 7, [hl] - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 2, [hl] ld a, $3 .asm_4667b - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret RLEData_4667f: ; 4667f (11:667f) @@ -137,7 +137,7 @@ SeafoamIslands4Script3: ; 4668f (11:668f) and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret SeafoamIslands4TextPointers: ; 4669a (11:669a) diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index 87942ca0..98c27666 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -1,12 +1,12 @@ SeafoamIslands5Script: ; 46799 (11:6799) call EnableAutoTextBoxDrawing - ld a, [W_SEAFOAMISLANDS5CURSCRIPT] + ld a, [wSeafoamIslands5CurScript] ld hl, SeafoamIslands5ScriptPointers jp CallFunctionInTable SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) xor a - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ld [wJoyIgnore], a ret @@ -18,12 +18,12 @@ SeafoamIslands5ScriptPointers: ; 467ad (11:67ad) dw SeafoamIslands5Script4 SeafoamIslands5Script4: ; 467b7 (11:67b7) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jr z, SeafoamIslands5Script_467a5 call EndTrainerBattle ld a, $0 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret SeafoamIslands5Script0: ; 467c7 (11:67c7) @@ -46,10 +46,10 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7) ld a, D_UP ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 res 2, [hl] ld a, $1 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret CoordsData_467fe: ; 467fe (11:67fe) @@ -66,7 +66,7 @@ SeafoamIslands5Script1: ; 46807 (11:6807) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret SeafoamIslands5Script2: ; 46816 (11:6816) @@ -92,7 +92,7 @@ SeafoamIslands5Script2: ; 46816 (11:6816) call StartSimulatingJoypadStates ld a, $3 .asm_46849 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret CoordsData_4684d: ; 4684d (11:684d) @@ -121,7 +121,7 @@ SeafoamIslands5Script3: ; 46860 (11:6860) and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret SeaFoamIslands5Script_46872: ; 46872 (11:6872) @@ -154,7 +154,7 @@ SeafoamIslands5Text3: ; 46893 (11:6893) ld hl, SeafoamIslands5TrainerHeader0 call TalkToTrainer ld a, $4 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a jp TextScriptEnd SeafoamIslands5BattleText2: ; 468a2 (11:68a2) diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index a6f2f860..5ca16e04 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -3,9 +3,9 @@ SilphCo10Script: ; 5a139 (16:6139) call EnableAutoTextBoxDrawing ld hl, SilphCo10TrainerHeaders ld de, SilphCo10ScriptPointers - ld a, [W_SILPHCO10CURSCRIPT] + ld a, [wSilphCo10CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO10CURSCRIPT], a + ld [wSilphCo10CurScript], a ret SilphCo10Script_5a14f: ; 5a14f (16:614f) diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 4c83c20d..79a2c328 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -3,9 +3,9 @@ SilphCo11Script: ; 620fa (18:60fa) call EnableAutoTextBoxDrawing ld hl, SilphCo11TrainerHeaders ld de, SilphCo11ScriptPointers - ld a, [W_SILPHCO11CURSCRIPT] + ld a, [wSilphCo11CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO11CURSCRIPT], a + ld [wSilphCo11CurScript], a ret SilphCo11Script_62110: ; 62110 (18:6110) @@ -150,8 +150,8 @@ SilphCo11Script_621c4: ; 621c4 (18:61c4) ld [wJoyIgnore], a SilphCo11Script_621c8: ; 621c8 (18:61c8) - ld [W_SILPHCO11CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSilphCo11CurScript], a + ld [wCurMapScript], a ret SilphCo11ScriptPointers: ; 621cf (18:61cf) @@ -205,7 +205,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a) jp SetSpriteFacingDirectionAndDelay SilphCo11Script5: ; 62227 (18:6227) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SilphCo11Script_621c4 ld a, [wcf0d] diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index ecb3b5a5..7fbd81c8 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -3,9 +3,9 @@ SilphCo2Script: ; 59cf1 (16:5cf1) call EnableAutoTextBoxDrawing ld hl, SilphCo2TrainerHeaders ld de, SilphCo2ScriptPointers - ld a, [W_SILPHCO2CURSCRIPT] + ld a, [wSilphCo2CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO2CURSCRIPT], a + ld [wSilphCo2CurScript], a ret SilphCo2Script_59d07: ; 59d07 (16:5d07) diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index bdaac452..119d7c66 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -3,9 +3,9 @@ SilphCo3Script: ; 59f5b (16:5f5b) call EnableAutoTextBoxDrawing ld hl, SilphCo3TrainerHeaders ld de, SilphCo3ScriptPointers - ld a, [W_SILPHCO3CURSCRIPT] + ld a, [wSilphCo3CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO3CURSCRIPT], a + ld [wSilphCo3CurScript], a ret SilphCo3Script_59f71: ; 59f71 (16:5f71) diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 0dad6f6b..38de73a7 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -3,9 +3,9 @@ SilphCo4Script: ; 19d0b (6:5d0b) call EnableAutoTextBoxDrawing ld hl, SilphCo4TrainerHeaders ld de, SilphCo4ScriptPointers - ld a, [W_SILPHCO4CURSCRIPT] + ld a, [wSilphCo4CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO4CURSCRIPT], a + ld [wSilphCo4CurScript], a ret SilphCo4Script_19d21: ; 19d21 (6:5d21) diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 7380f98f..080ed963 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -3,9 +3,9 @@ SilphCo5Script: ; 19f37 (6:5f37) call EnableAutoTextBoxDrawing ld hl, SilphCo5TrainerHeaders ld de, SilphCo5ScriptPointers - ld a, [W_SILPHCO5CURSCRIPT] + ld a, [wSilphCo5CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO5CURSCRIPT], a + ld [wSilphCo5CurScript], a ret SilphCo5Script_19f4d: ; 19f4d (6:5f4d) diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index fa199069..6d7978b2 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -3,9 +3,9 @@ SilphCo6Script: ; 1a1a9 (6:61a9) call EnableAutoTextBoxDrawing ld hl, SilphCo6TrainerHeaders ld de, SilphCo6ScriptPointers - ld a, [W_SILPHCO6CURSCRIPT] + ld a, [wSilphCo6CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO6CURSCRIPT], a + ld [wSilphCo6CurScript], a ret SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 5333e07f..f771f865 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -3,9 +3,9 @@ SilphCo7Script: ; 51b61 (14:5b61) call EnableAutoTextBoxDrawing ld hl, SilphCo7TrainerHeaders ld de, SilphCo7ScriptPointers - ld a, [W_SILPHCO7CURSCRIPT] + ld a, [wSilphCo7CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO7CURSCRIPT], a + ld [wSilphCo7CurScript], a ret SilphCo7Script_51b77: ; 51b77 (14:5b77) @@ -106,8 +106,8 @@ SilphCo7Text_51c0c: ; 51c0c (14:5c0c) ld [wJoyIgnore], a SilphCo7Text_51c10: ; 51c10 (14:5c10) - ld [W_SILPHCO7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSilphCo7CurScript], a + ld [wCurMapScript], a ret SilphCo7ScriptPointers: ; 51c17 (14:5c17) @@ -184,8 +184,8 @@ SilphCo7Script3: ; 51c82 (14:5c82) ld de, SilphCo7Text_51ecd call SaveEndBattleTextPointers ld a, OPP_SONY2 - ld [W_CUROPPONENT], a - ld a, [W_RIVALSTARTER] + ld [wCurOpponent], a + ld a, [wRivalStarter] cp STARTER2 jr nz, .asm_51cb6 ld a, $7 @@ -198,12 +198,12 @@ SilphCo7Script3: ; 51c82 (14:5c82) .asm_51cbe ld a, $9 .asm_51cc0 - ld [W_TRAINERNO], a + ld [wTrainerNo], a ld a, $4 jp SilphCo7Text_51c10 SilphCo7Script4: ; 51cc8 (14:5cc8) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SilphCo7Text_51c0c ld a, $f0 diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index 9ea985a8..bb3217ec 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -3,9 +3,9 @@ SilphCo8Script: ; 56504 (15:6504) call EnableAutoTextBoxDrawing ld hl, SilphCo8TrainerHeader0 ld de, SilphCo8ScriptPointers - ld a, [W_SILPHCO8CURSCRIPT] + ld a, [wSilphCo8CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO8CURSCRIPT], a + ld [wSilphCo8CurScript], a ret SilphCo8Script_5651a: ; 5651a (15:651a) diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 02638459..2ab7423b 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -3,9 +3,9 @@ SilphCo9Script: ; 5d7bb (17:57bb) call EnableAutoTextBoxDrawing ld hl, SilphCo9TrainerHeaders ld de, SilphCo9ScriptPointers - ld a, [W_SILPHCO9CURSCRIPT] + ld a, [wSilphCo9CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO9CURSCRIPT], a + ld [wSilphCo9CurScript], a ret SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index 3b53b961..d39b902f 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -2,9 +2,9 @@ SSAnne10Script: ; 61d55 (18:5d55) call EnableAutoTextBoxDrawing ld hl, SSAnne10TrainerHeaders ld de, SSAnne10ScriptPointers - ld a, [W_SSANNE10CURSCRIPT] + ld a, [wSSAnne10CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE10CURSCRIPT], a + ld [wSSAnne10CurScript], a ret SSAnne10ScriptPointers: ; 61d68 (18:5d68) diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 8bcc2b17..fb3d0536 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -1,13 +1,13 @@ SSAnne2Script: ; 6139f (18:539f) call EnableAutoTextBoxDrawing ld hl, SSAnne2ScriptPointers - ld a, [W_SSANNE2CURSCRIPT] + ld a, [wSSAnne2CurScript] jp CallFunctionInTable SSAnne2Script_613ab: ; 613ab (18:53ab) xor a ld [wJoyIgnore], a - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret SSAnne2ScriptPointers: ; 613b3 (18:53b3) @@ -53,7 +53,7 @@ SSAnne2Script0: ; 613be (18:53be) .asm_61403 call MoveSprite ld a, $1 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret MovementData_6140c: ; 6140c (18:540c) @@ -71,7 +71,7 @@ CoordsData_61411: ; 61411 (18:5411) db $FF SSAnne2Script_61416: ; 61416 (18:5416) - ld a, [W_XCOORD] + ld a, [wXCoord] cp $25 jr nz, .asm_61426 ld a, PLAYER_DIR_LEFT @@ -98,10 +98,10 @@ SSAnne2Script1: ; 61430 (18:5430) call DisplayTextID call Delay3 ld a, OPP_SONY2 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $1 @@ -114,15 +114,15 @@ SSAnne2Script1: ; 61430 (18:5430) .Charmander ld a, $3 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a call SSAnne2Script_61416 ld a, $2 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret SSAnne2Script2: ; 6146d (18:546d) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SSAnne2Script_613ab call SSAnne2Script_61416 @@ -134,7 +134,7 @@ SSAnne2Script2: ; 6146d (18:546d) ld a, $2 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld a, [W_XCOORD] + ld a, [wXCoord] cp $25 jr nz, .asm_61497 ld de, MovementData_614b9 @@ -150,7 +150,7 @@ SSAnne2Script2: ; 6146d (18:546d) call PlaySound callba Music_RivalAlternateStart ld a, $3 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret MovementData_614b7: ; 614b7 (18:54b7) @@ -175,7 +175,7 @@ SSAnne2Script3: ; 614be (18:54be) predef HideObject call PlayDefaultMusic ld a, $4 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret SSAnne2TextPointers: ; 614db (18:54db) diff --git a/scripts/ssanne5.asm b/scripts/ssanne5.asm index 76553563..698e9f14 100755 --- a/scripts/ssanne5.asm +++ b/scripts/ssanne5.asm @@ -2,9 +2,9 @@ SSAnne5Script: ; 616ae (18:56ae) call EnableAutoTextBoxDrawing ld hl, SSAnne5TrainerHeader0 ld de, SSAnne5ScriptPointers - ld a, [W_SSANNE5CURSCRIPT] + ld a, [wSSAnne5CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE5CURSCRIPT], a + ld [wSSAnne5CurScript], a ret SSAnne5ScriptPointers: ; 616c1 (18:56c1) diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index 195c9a81..2e7dcf67 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -2,9 +2,9 @@ SSAnne8Script: ; 61976 (18:5976) call EnableAutoTextBoxDrawing ld hl, SSAnne8TrainerHeaders ld de, SSAnne8ScriptPointers - ld a, [W_SSANNE8CURSCRIPT] + ld a, [wSSAnne8CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE8CURSCRIPT], a + ld [wSSAnne8CurScript], a ret SSAnne8ScriptPointers: ; 61989 (18:5989) diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm index 525a2964..bec4b838 100755 --- a/scripts/ssanne9.asm +++ b/scripts/ssanne9.asm @@ -5,9 +5,9 @@ SSAnne9Script: ; 61b4b (18:5b4b) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, SSAnne9TrainerHeaders ld de, SSAnne9ScriptPointers - ld a, [W_SSANNE9CURSCRIPT] + ld a, [wSSAnne9CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE9CURSCRIPT], a + ld [wSSAnne9CurScript], a ret SSAnne9ScriptPointers: ; 61b64 (18:5b64) diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index 42459766..c5818032 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -2,9 +2,9 @@ UnknownDungeon3Script: ; 45ef0 (11:5ef0) call EnableAutoTextBoxDrawing ld hl, UnknownDungeon3TrainerHeaders ld de, UnknownDungeon3ScriptPointers - ld a, [W_UNKNOWNDUNGEON3CURSCRIPT] + ld a, [wUnknownDungeon3CurScript] call ExecuteCurMapScriptInTable - ld [W_UNKNOWNDUNGEON3CURSCRIPT], a + ld [wUnknownDungeon3CurScript], a ret UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03) diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index a203323f..b60d4111 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -10,7 +10,7 @@ VermilionCityScript: ; 197a1 (6:57a1) res 5, [hl] call nz, VermilionCityScript_197c0 ld hl, VermilionCityScriptPointers - ld a, [W_VERMILIONCITYCURSCRIPT] + ld a, [wVermilionCityCurScript] jp CallFunctionInTable VermilionCityScript_197c0: ; 197c0 (6:57c0) @@ -27,7 +27,7 @@ VermilionCityScript_197cb: ; 197cb (6:57cb) SetEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT ret nz ld a, $2 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScriptPointers: ; 197dc (6:57dc) @@ -64,7 +64,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret CoordsData_19823: ; 19823 (6:5823) @@ -76,7 +76,7 @@ VermilionCityScript4: ; 19826 (6:5826) call ArePlayerCoordsInArray ret c ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript2: ; 19833 (6:5833) @@ -89,7 +89,7 @@ VermilionCityScript2: ; 19833 (6:5833) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript3: ; 1984e (6:584e) @@ -100,7 +100,7 @@ VermilionCityScript3: ; 1984e (6:584e) ld [wJoyIgnore], a ld [hJoyHeld], a ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript1: ; 1985f (6:585f) @@ -110,7 +110,7 @@ VermilionCityScript1: ; 1985f (6:585f) ld c, 10 call DelayFrames ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityTextPointers: ; 1986f (6:586f) @@ -182,7 +182,7 @@ VermilionCityText3: ; 198b1 (6:58b1) ld hl, SSAnneFlashedTicketText call PrintText ld a, $4 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a jr .asm_198fc .asm_198f6 ld hl, SSAnneNotHereText diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 78a38aec..15791f0e 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -11,9 +11,9 @@ VermilionGymScript: ; 5ca26 (17:4a26) call EnableAutoTextBoxDrawing ld hl, VermilionGymTrainerHeader0 ld de, VermilionGymScriptPointers - ld a, [W_VERMILIONGYMCURSCRIPT] + ld a, [wVermilionGymCurScript] call ExecuteCurMapScriptInTable - ld [W_VERMILIONGYMCURSCRIPT], a + ld [wVermilionGymCurScript], a ret VermilionGymScript_5ca4c: ; 5ca4c (17:4a4c) @@ -44,8 +44,8 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a) xor a ld [wJoyIgnore], a - ld [W_VERMILIONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wVermilionGymCurScript], a + ld [wCurMapScript], a ret VermilionGymScriptPointers: ; 5ca95 (17:4a95) @@ -55,7 +55,7 @@ VermilionGymScriptPointers: ; 5ca95 (17:4a95) dw VermilionGymScript3 VermilionGymScript3: ; 5ca9d (17:4a9d) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, VermilionGymScript_5ca8a ld a, $f0 @@ -79,7 +79,7 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5cad3 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 2, [hl] ld hl, wBeatGymFlags set 2, [hl] @@ -156,12 +156,12 @@ VermilionGymText1: ; 5cb1d (17:4b1d) call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a xor a ld [hJoyHeld], a ld a, $3 - ld [W_VERMILIONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wVermilionGymCurScript], a + ld [wCurMapScript], a .asm_5cb6a jp TextScriptEnd diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 11f5d5db..e66cc375 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -6,9 +6,9 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) call EnableAutoTextBoxDrawing ld hl, VictoryRoad1TrainerHeaders ld de, VictoryRoad1ScriptPointers - ld a, [W_VICTORYROAD1CURSCRIPT] + ld a, [wVictoryRoad1CurScript] call ExecuteCurMapScriptInTable - ld [W_VICTORYROAD1CURSCRIPT], a + ld [wVictoryRoad1CurScript], a ret .next CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index cb956b1c..6fc4747c 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -10,9 +10,9 @@ VictoryRoad2Script: ; 5179d (14:579d) call EnableAutoTextBoxDrawing ld hl, VictoryRoad2TrainerHeaders ld de, VictoryRoad2ScriptPointers - ld a, [W_VICTORYROAD2CURSCRIPT] + ld a, [wVictoryRoad2CurScript] call ExecuteCurMapScriptInTable - ld [W_VICTORYROAD2CURSCRIPT], a + ld [wVictoryRoad2CurScript], a ret VictoryRoad2Script_517c4: ; 517c4 (14:57c4) diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 22e6813a..40117398 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -3,9 +3,9 @@ VictoryRoad3Script: ; 44980 (11:4980) call EnableAutoTextBoxDrawing ld hl, VictoryRoad3TrainerHeaders ld de, VictoryRoad3ScriptPointers - ld a, [W_VICTORYROAD3CURSCRIPT] + ld a, [wVictoryRoad3CurScript] call ExecuteCurMapScriptInTable - ld [W_VICTORYROAD3CURSCRIPT], a + ld [wVictoryRoad3CurScript], a ret VictoryRoad3Script_44996: ; 44996 (11:4996) diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index ae0b6212..0bbaec0d 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -1,7 +1,7 @@ ViridianCityScript: ; 18ff1 (6:4ff1) call EnableAutoTextBoxDrawing ld hl, ViridianCityScriptPointers - ld a, [W_VIRIDIANCITYCURSCRIPT] + ld a, [wViridianCityCurScript] jp CallFunctionInTable ViridianCityScriptPointers: ; 18ffd (6:4ffd) @@ -17,16 +17,16 @@ ViridianCityScript0: ; 19005 (6:5005) ViridianCityScript_1900b: ; 1900b (6:500b) CheckEvent EVENT_VIRIDIAN_GYM_OPEN ret nz - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] cp %01111111 jr nz, .asm_1901e SetEvent EVENT_VIRIDIAN_GYM_OPEN ret .asm_1901e - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $20 ret nz ld a, $e @@ -36,16 +36,16 @@ ViridianCityScript_1900b: ; 1900b (6:500b) ld [hJoyHeld], a call ViridianCityScript_190cf ld a, $3 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript_1903d: ; 1903d (6:503d) CheckEvent EVENT_GOT_POKEDEX ret nz - ld a, [W_YCOORD] + ld a, [wYCoord] cp $9 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $13 ret nz ld a, $5 @@ -55,7 +55,7 @@ ViridianCityScript_1903d: ; 1903d (6:503d) ld [hJoyHeld], a call ViridianCityScript_190cf ld a, $3 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript1: ; 19062 (6:5062) @@ -72,13 +72,13 @@ ViridianCityScript1: ; 19062 (6:5062) ; set up battle for Old Man ld a, BATTLE_TYPE_OLD_MAN - ld [W_BATTLETYPE], a + ld [wBattleType], a ld a, 5 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, WEEDLE - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, $2 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript2: ; 1908f (6:508f) @@ -98,10 +98,10 @@ ViridianCityScript2: ; 1908f (6:508f) ld [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [W_BATTLETYPE], a + ld [wBattleType], a ld [wJoyIgnore], a ld a, $0 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript3: ; 190c1 (6:50c1) @@ -110,7 +110,7 @@ ViridianCityScript3: ; 190c1 (6:50c1) ret nz call Delay3 ld a, 0 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript_190cf: ; 190cf (6:50cf) @@ -147,7 +147,7 @@ ViridianCityText1: ; 19102 (6:5102) ViridianCityText2: ; 19107 (6:5107) TX_ASM - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] cp %01111111 ld hl, ViridianCityText_19127 jr z, .asm_ae9fe @@ -222,7 +222,7 @@ ViridianCityText5: ; 1917f (6:517f) call PrintText call ViridianCityScript_190cf ld a, $3 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a jp TextScriptEnd ViridianCityText_19191: ; 19191 (6:5191) @@ -281,7 +281,7 @@ ViridianCityText7: ; 191df (6:51df) ld hl, ViridianCityText_1920f call PrintText ld a, $1 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a jr .asm_2413a .asm_42f68 ld hl, ViridianCityText_19214 diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index 892eeef2..3c164046 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -2,9 +2,9 @@ ViridianForestScript: ; 6110d (18:510d) call EnableAutoTextBoxDrawing ld hl, ViridianForestTrainerHeaders ld de, ViridianForestScriptPointers - ld a, [W_VIRIDIANFORESTCURSCRIPT] + ld a, [wViridianForestCurScript] call ExecuteCurMapScriptInTable - ld [W_VIRIDIANFORESTCURSCRIPT], a + ld [wViridianForestCurScript], a ret ViridianForestScriptPointers: ; 61120 (18:5120) diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 6cded55d..cdbe939b 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -5,9 +5,9 @@ ViridianGymScript: ; 748a3 (1d:48a3) call EnableAutoTextBoxDrawing ld hl, ViridianGymTrainerHeaders ld de, ViridianGymScriptPointers - ld a, [W_VIRIDIANGYMCURSCRIPT] + ld a, [wViridianGymCurScript] call ExecuteCurMapScriptInTable - ld [W_VIRIDIANGYMCURSCRIPT], a + ld [wViridianGymCurScript], a ret Gym8CityName: ; 748bf (1d:48bf) @@ -18,8 +18,8 @@ Gym8LeaderName: ; 748cd (1d:48cd) ViridianGymScript_748d6: ; 748d6 (1d:48d6) xor a ld [wJoyIgnore], a - ld [W_VIRIDIANGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wViridianGymCurScript], a + ld [wCurMapScript], a ret ViridianGymScriptPointers: ; 748e1 (1d:48e1) @@ -30,9 +30,9 @@ ViridianGymScriptPointers: ; 748e1 (1d:48e1) dw ViridianGymScript4 ViridianGymScript0: ; 748eb (1d:48eb) - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a ld hl, ViridianGymArrowTilePlayerMovement call DecodeArrowMovementRLE @@ -46,7 +46,7 @@ ViridianGymScript0: ; 748eb (1d:48eb) ld a, $ff ld [wJoyIgnore], a ld a, $4 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -125,13 +125,13 @@ ViridianGymScript4: ; 7496b (1d:496b) ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret .asm_74980 jpba LoadSpinnerArrowTiles ViridianGymScript3: ; 74988 (1d:4988) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, ViridianGymScript_748d6 ld a, $f0 @@ -154,7 +154,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_749be - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 7, [hl] ld hl, wBeatGymFlags set 7, [hl] @@ -295,9 +295,9 @@ ViridianGymText1: ; 74a69 (1d:4a69) call EngageMapTrainer call InitBattleEnemyParameters ld a, $8 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a ld a, $3 - ld [W_VIRIDIANGYMCURSCRIPT], a + ld [wViridianGymCurScript], a .asm_6dff7 jp TextScriptEnd diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 5cb6eaea..65d97519 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -2,7 +2,7 @@ ViridianMartScript: ; 1d46e (7:546e) call ViridianMartScript_1d47d call EnableAutoTextBoxDrawing ld hl, ViridianMartScriptPointers - ld a, [W_VIRIDIANMARKETCURSCRIPT] + ld a, [wViridianMarketCurScript] jp CallFunctionInTable ViridianMartScript_1d47d: ; 1d47d (7:547d) @@ -14,9 +14,9 @@ ViridianMartScript_1d47d: ; 1d47d (7:547d) ld hl, ViridianMartTextPointers + $a ; starts at ViridianMartText6 .asm_1d48c ld a, l - ld [W_MAPTEXTPTR], a + ld [wMapTextPtr], a ld a, h - ld [W_MAPTEXTPTR+1], a + ld [wMapTextPtr+1], a ret ViridianMartScriptPointers: ; 1d495 (7:5495) @@ -36,7 +36,7 @@ ViridianMartScript0: ; 1d49b (7:549b) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_VIRIDIANMARKETCURSCRIPT], a + ld [wViridianMarketCurScript], a ret RLEMovement1d4bb: ; 1d4bb (7:54bb) @@ -56,7 +56,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) call GiveItem SetEvent EVENT_GOT_OAKS_PARCEL ld a, $2 - ld [W_VIRIDIANMARKETCURSCRIPT], a + ld [wViridianMarketCurScript], a ; fallthrough ViridianMartScript2: ; 1d4df (7:54df) ret diff --git a/text.asm b/text.asm index 2ed5758f..7bec0f4e 100644 --- a/text.asm +++ b/text.asm @@ -243,7 +243,7 @@ INCLUDE "text/maps/seafoam_islands_b3f.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" _AIBattleWithdrawText:: ; 880be (22:40be) - TX_RAM W_TRAINERNAME + TX_RAM wTrainerName text " with-" line "drew @" TX_RAM wEnemyMonNick @@ -251,7 +251,7 @@ _AIBattleWithdrawText:: ; 880be (22:40be) prompt _AIBattleUseItemText:: ; 880d5 (22:40d5) - TX_RAM W_TRAINERNAME + TX_RAM wTrainerName db $0 line "used @" TX_RAM wcd6d @@ -265,7 +265,7 @@ _TradeWentToText:: ; 880ef (22:40ef) TX_RAM wcf4b text " went" line "to @" - TX_RAM W_GRASSRATE + TX_RAM wGrassRate text "." done @@ -277,7 +277,7 @@ _TradeForText:: ; 88103 (22:4103) done _TradeSendsText:: ; 88112 (22:4112) - TX_RAM W_GRASSRATE + TX_RAM wGrassRate text " sends" line "@" TX_RAM wcd6d @@ -285,7 +285,7 @@ _TradeSendsText:: ; 88112 (22:4112) done _TradeWavesFarewellText:: ; 88124 (22:4124) - TX_RAM W_GRASSRATE + TX_RAM wGrassRate text " waves" line "farewell as" done @@ -304,7 +304,7 @@ _TradeTakeCareText:: ; 88150 (22:4150) done _TradeWillTradeText:: ; 8816a (22:416a) - TX_RAM W_GRASSRATE + TX_RAM wGrassRate text " will" line "trade @" TX_RAM wcd6d @@ -1122,7 +1122,7 @@ _MoneyForWinningText:: ; 896dd (22:56dd) _TrainerDefeatedText:: ; 896f9 (22:56f9) text $52, " defeated" line "@" - TX_RAM W_TRAINERNAME + TX_RAM wTrainerName text "!" prompt @@ -1152,12 +1152,12 @@ _PlayerBlackedOutText2:: ; 89748 (22:5748) _LinkBattleLostText:: ; 89772 (22:5772) text $52, " lost to" line "@" - TX_RAM W_TRAINERNAME + TX_RAM wTrainerName text "!" prompt _TrainerAboutToUseText:: ; 89784 (22:5784) - TX_RAM W_TRAINERNAME + TX_RAM wTrainerName text " is" line "about to use" cont"@" @@ -1169,7 +1169,7 @@ _TrainerAboutToUseText:: ; 89784 (22:5784) done _TrainerSentOutText:: ; 897b4 (22:57b4) - TX_RAM W_TRAINERNAME + TX_RAM wTrainerName text " sent" line "out @" TX_RAM wEnemyMonNick @@ -1475,7 +1475,7 @@ _GrewLevelText:: ; 89c01 (22:5c01) TX_RAM wcd6d text " grew" line "to level @" - TX_NUM W_CURENEMYLVL, 1, 3 + TX_NUM wCurEnemyLVL, 1, 3 text "!@@" _WildMonAppearedText:: ; 89c1d (22:5c1d) @@ -1500,7 +1500,7 @@ _EnemyAppearedText:: ; 89c4f (22:5c4f) prompt _TrainerWantsToFightText:: ; 89c5e (22:5c5e) - TX_RAM W_TRAINERNAME + TX_RAM wTrainerName text " wants" line "to fight!" prompt @@ -1683,7 +1683,7 @@ _RareCandyText:: ; 89ee2 (22:5ee2) TX_RAM wcd6d text " grew" line "to level @" - TX_NUM W_CURENEMYLVL, $1,$3 + TX_NUM wCurEnemyLVL, $1,$3 text "!@@" _TurnedOnPC1Text:: ; 89efe (22:5efe) diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm index 02e35344..7c0c0311 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare_1.asm @@ -48,7 +48,7 @@ _DayCareOweMoneyText:: ; 8ac7d (22:6c7d) _DayCareGotMonBackText:: ; 8acae (22:6cae) text $52, " got" line "@" - TX_RAM W_DAYCAREMONNAME + TX_RAM wDayCareMonName text " back!" done diff --git a/wram.asm b/wram.asm index 15987dda..98526be0 100755 --- a/wram.asm +++ b/wram.asm @@ -1484,29 +1484,29 @@ wUpdateSpritesEnabled:: ; cfcb ; other values aren't used ds 1 -W_ENEMYMOVENUM:: ; cfcc +wEnemyMoveNum:: ; cfcc ds 1 -W_ENEMYMOVEEFFECT:: ; cfcd +wEnemyMoveEffect:: ; cfcd ds 1 -W_ENEMYMOVEPOWER:: ; cfce +wEnemyMovePower:: ; cfce ds 1 -W_ENEMYMOVETYPE:: ; cfcf +wEnemyMoveType:: ; cfcf ds 1 -W_ENEMYMOVEACCURACY:: ; cfd0 +wEnemyMoveAccuracy:: ; cfd0 ds 1 -W_ENEMYMOVEMAXPP:: ; cfd1 +wEnemyMoveMaxPP:: ; cfd1 ds 1 -W_PLAYERMOVENUM:: ; cfd2 +wPlayerMoveNum:: ; cfd2 ds 1 -W_PLAYERMOVEEFFECT:: ; cfd3 +wPlayerMoveEffect:: ; cfd3 ds 1 -W_PLAYERMOVEPOWER:: ; cfd4 +wPlayerMovePower:: ; cfd4 ds 1 -W_PLAYERMOVETYPE:: ; cfd5 +wPlayerMoveType:: ; cfd5 ds 1 -W_PLAYERMOVEACCURACY:: ; cfd6 +wPlayerMoveAccuracy:: ; cfd6 ds 1 -W_PLAYERMOVEMAXPP:: ; cfd7 +wPlayerMoveMaxPP:: ; cfd7 ds 1 @@ -1557,7 +1557,7 @@ wBattleMonNick:: ds NAME_LENGTH ; d009 wBattleMon:: battle_struct wBattleMon ; d014 -W_TRAINERCLASS:: ; d031 +wTrainerClass:: ; d031 ds 1 ds 1 @@ -1582,13 +1582,13 @@ wMissableObjectCounter:: ; d048 ds 1 -W_TRAINERNAME:: ; d04a +wTrainerName:: ; d04a ; 13 bytes for the letters of the opposing trainer ; the name is terminated with $50 with possible ; unused trailing letters ds 13 -W_ISINBATTLE:: ; d057 +wIsInBattle:: ; d057 ; lost battle, this is -1 ; no battle, this is 0 ; wild battle, this is 1 @@ -1599,12 +1599,12 @@ wPartyGainExpFlags:: ; d058 ; flags that indicate which party members should be be given exp when GainExperience is called flag_array 6 -W_CUROPPONENT:: ; d059 +wCurOpponent:: ; d059 ; in a wild battle, this is the species of pokemon ; in a trainer battle, this is the trainer class + 200 ds 1 -W_BATTLETYPE:: ; d05a +wBattleType:: ; d05a ; in normal battle, this is 0 ; in old man battle, this is 1 ; in safari battle, this is 2 @@ -1619,12 +1619,12 @@ wDamageMultipliers:: ; d05b ; bit 7: STAB ds 1 -W_LONEATTACKNO:: ; d05c +wLoneAttackNo:: ; d05c ; which entry in LoneAttacks to use -W_GYMLEADERNO:: ; d05c +wGymLeaderNo:: ; d05c ; it's actually the same thing as ^ ds 1 -W_TRAINERNO:: ; d05d +wTrainerNo:: ; d05d ; which instance of [youngster, lass, etc] is this? ds 1 @@ -1635,7 +1635,7 @@ wCriticalHitOrOHKO:: ; d05e ; $ff = failed OHKO ds 1 -W_MOVEMISSED:: ; d05f +wMoveMissed:: ; d05f ds 1 wPlayerStatsToDouble:: ; d060 @@ -1646,7 +1646,7 @@ wPlayerStatsToHalve:: ; d061 ; always 0 ds 1 -W_PLAYERBATTSTATUS1:: ; d062 +wPlayerBattleStatus1:: ; d062 ; bit 0 - bide ; bit 1 - thrash / petal dance ; bit 2 - attacking multiple times (e.g. double kick) @@ -1657,7 +1657,7 @@ W_PLAYERBATTSTATUS1:: ; d062 ; bit 7 - confusion ds 1 -W_PLAYERBATTSTATUS2:: ; d063 +wPlayerBattleStatus2:: ; d063 ; bit 0 - X Accuracy effect ; bit 1 - protected by "mist" ; bit 2 - focus energy effect @@ -1667,7 +1667,7 @@ W_PLAYERBATTSTATUS2:: ; d063 ; bit 7 - leech seeded ds 1 -W_PLAYERBATTSTATUS3:: ; d064 +wPlayerBattleStatus3:: ; d064 ; bit 0 - toxic ; bit 1 - light screen ; bit 2 - reflect @@ -1682,23 +1682,24 @@ wEnemyStatsToHalve:: ; d066 ; always 0 ds 1 -W_ENEMYBATTSTATUS1:: ; d067 +wEnemyBattleStatus1:: ; d067 ds 1 -W_ENEMYBATTSTATUS2:: ; d068 +wEnemyBattleStatus2:: ; d068 ds 1 -W_ENEMYBATTSTATUS3:: ; d069 +wEnemyBattleStatus3:: ; d069 ds 1 wPlayerNumAttacksLeft:: ; when the player is attacking multiple times, the number of attacks left ds 1 -W_PLAYERCONFUSEDCOUNTER:: ; d06b +wPlayerConfusedCounter:: ; d06b ds 1 -W_PLAYERTOXICCOUNTER:: ; d06c +wPlayerToxicCounter:: ; d06c ds 1 -W_PLAYERDISABLEDMOVE:: ; d06d + +wPlayerDisabledMove:: ; d06d ; high nibble: which move is disabled (1-4) ; low nibble: disable turns left ds 1 @@ -1709,12 +1710,13 @@ wEnemyNumAttacksLeft:: ; d06f ; when the enemy is attacking multiple times, the number of attacks left ds 1 -W_ENEMYCONFUSEDCOUNTER:: ; d070 +wEnemyConfusedCounter:: ; d070 ds 1 -W_ENEMYTOXICCOUNTER:: ; d071 +wEnemyToxcCounter:: ; d071 ds 1 -W_ENEMYDISABLEDMOVE:: ; d072 + +wEnemyDisabledMove:: ; d072 ; high nibble: which move is disabled (1-4) ; low nibble: disable turns left ds 1 @@ -1752,7 +1754,7 @@ wDefaultMap:: ; d07c wMenuItemOffset:: ; d07c -W_ANIMATIONID:: ; d07c +wAnimationID:: ; d07c ; ID number of the current battle animation ds 1 @@ -1772,26 +1774,26 @@ wSavedListScrollOffset:: ; d07e ds 2 ; base coordinates of frame block -W_BASECOORDX:: ; d081 +wBaseCoordX:: ; d081 ds 1 -W_BASECOORDY:: ; d082 +wBaseCoordY:: ; d082 ds 1 ; low health alarm counter/enable ; high bit = enable, others = timer to cycle frequencies wLowHealthAlarm:: ds 1 ; d083 -W_FBTILECOUNTER:: ; d084 +wFBTileCounter:: ; d084 ; counts how many tiles of the current frame block have been drawn ds 1 wMovingBGTilesCounter2:: ; d085 ds 1 -W_SUBANIMFRAMEDELAY:: ; d086 +wSubAnimFrameDelay:: ; d086 ; duration of each frame of the current subanimation in terms of screen refreshes ds 1 -W_SUBANIMCOUNTER:: ; d087 +wSubAnimCounter:: ; d087 ; counts the number of subentries left in the current subanimation ds 1 @@ -1800,7 +1802,7 @@ wSaveFileStatus:: ; d088 ; 2 = save file exists and no corruption has been detected ds 1 -W_NUMFBTILES:: ; d089 +wNumFBTiles:: ; d089 ; number of tiles in current battle animation frame block ds 1 @@ -1836,7 +1838,7 @@ wSlideMonDelay:: ; d08b wAnimCounter:: ; d08b ; generic counter variable for various animations -W_SUBANIMTRANSFORM:: ; d08b +wSubAnimTransform:: ; d08b ; controls what transformations are applied to the subanimation ; 01: flip horizontally and vertically ; 02: flip horizontally and translate downwards 40 pixels @@ -1857,7 +1859,7 @@ wEndBattleTextRomBank:: ; d092 ds 1 -W_SUBANIMADDRPTR:: ; d094 +wSubAnimAddrPtr:: ; d094 ; the address _of the address_ of the current subanimation entry ds 2 @@ -1867,7 +1869,7 @@ wSlotMachineAllowMatchesCounter:: ; d096 ; the only way it can increase. Winning certain payout amounts will decrement it ; or zero it. -W_SUBANIMSUBENTRYADDR:: ; d096 +wSubAnimSubEntryAddr:: ; d096 ; the address of the current subentry of the current subanimation ds 2 @@ -1885,17 +1887,17 @@ wTownMapSpriteBlinkingEnabled:: ; d09b wUnusedD09B:: ; d09b ds 1 -W_FBDESTADDR:: ; d09c +wFBDestAddr:: ; d09c ; current destination address in OAM for frame blocks (big endian) ds 2 -W_FBMODE:: ; d09e +wFBMode:: ; d09e ; controls how the frame blocks are put together to form frames ; specifically, after finishing drawing the frame block, the frame block's mode determines what happens ; 00: clean OAM buffer and delay ; 02: move onto the next frame block with no delay and no cleaning OAM buffer ; 03: delay, but don't clean OAM buffer -; 04: delay, without cleaning OAM buffer, and do not advance [W_FBDESTADDR], so that the next frame block will overwrite this one +; 04: delay, without cleaning OAM buffer, and do not advance [wFBDestAddr], so that the next frame block will overwrite this one ds 1 wLinkCableAnimBulgeToggle:: ; d09f @@ -1922,50 +1924,50 @@ wSlideMonUpBottomRowLeftTile:: ; d09f wDisableVBlankWYUpdate:: ds 1 ; if non-zero, don't update WY during V-blank -W_SPRITECURPOSX:: ; d0a1 +wSpriteCurPosX:: ; d0a1 ds 1 -W_SPRITECURPOSY:: ; d0a2 +wSpriteCurPosY:: ; d0a2 ds 1 -W_SPRITEWITDH:: ; d0a3 +wSpriteWidth:: ; d0a3 ds 1 -W_SPRITEHEIGHT:: ; d0a4 +wSpriteHeight:: ; d0a4 ds 1 -W_SPRITEINPUTCURBYTE:: ; d0a5 +wSpriteInputCurByte:: ; d0a5 ; current input byte ds 1 -W_SPRITEINPUTBITCOUNTER:: ; d0a6 +wSpriteInputBitCounter:: ; d0a6 ; bit offset of last read input bit ds 1 -W_SPRITEOUTPUTBITOFFSET:: ; d0a7; determines where in the output byte the two bits are placed. Each byte contains four columns (2bpp data) +wSpriteOutputBitOffset:: ; d0a7; determines where in the output byte the two bits are placed. Each byte contains four columns (2bpp data) ; 3 -> XX000000 1st column ; 2 -> 00XX0000 2nd column ; 1 -> 0000XX00 3rd column ; 0 -> 000000XX 4th column ds 1 -W_SPRITELOADFLAGS:: ; d0a8 +wSpriteLoadFlags:: ; d0a8 ; bit 0 determines used buffer (0 -> $a188, 1 -> $a310) ; bit 1 loading last sprite chunk? (there are at most 2 chunks per load operation) ds 1 -W_SPRITEUNPACKMODE:: ; d0a9 +wSpriteUnpackMode:: ; d0a9 ds 1 -W_SPRITEFLIPPED:: ; d0aa +wSpriteFlipped:: ; d0aa ds 1 -W_SPRITEINPUTPTR:: ; d0ab +wSpriteInputPtr:: ; d0ab ; pointer to next input byte ds 2 -W_SPRITEOUTPUTPTR:: ; d0ad +wSpriteOutputPtr:: ; d0ad ; pointer to current output byte ds 2 -W_SPRITEOUTPUTPTRCACHED:: ; d0af +wSpriteOutputPtrCached:: ; d0af ; used to revert pointer for different bit offsets ds 2 -W_SPRITEDECODETABLE0PTR:: ; d0b1 +wSpriteDecodeTable0Ptr:: ; d0b1 ; pointer to differential decoding table (assuming initial value 0) ds 2 -W_SPRITEDECODETABLE1PTR:: ; d0b3 +wSpriteDecodeTable1Ptr:: ; d0b3 ; pointer to differential decoding table (assuming initial value 1) ds 2 @@ -1977,49 +1979,49 @@ wNameListType:: ; d0b6 wPredefBank:: ; d0b7 ds 1 -W_MONHEADER:: ; d0b8 +wMonHeader:: ; d0b8 -W_MONHINDEX:: ; d0b8 +wMonHIndex:: ; d0b8 ; In the ROM base stats data stucture, this is the dex number, but it is ; overwritten with the internal index number after the header is copied to WRAM. ds 1 -W_MONHBASESTATS:: ; d0b9 -W_MONHBASEHP:: ; d0b9 +wMonHBaseStats:: ; d0b9 +wMonHBaseHP:: ; d0b9 ds 1 -W_MONHBASEATTACK:: ; d0ba +wMonHBaseAttack:: ; d0ba ds 1 -W_MONHBASEDEFENSE:: ; d0bb +wMonHBaseDefense:: ; d0bb ds 1 -W_MONHBASESPEED:: ; d0bc +wMonHBaseSpeed:: ; d0bc ds 1 -W_MONHBASESPECIAL:: ; d0bd +wMonHBaseSpecial:: ; d0bd ds 1 -W_MONHTYPES:: ; d0be -W_MONHTYPE1:: ; d0be +wMonHTypes:: ; d0be +wMonHType1:: ; d0be ds 1 -W_MONHTYPE2:: ; d0bf +wMonHType2:: ; d0bf ds 1 -W_MONHCATCHRATE:: ; d0c0 +wMonHCatchRate:: ; d0c0 ds 1 -W_MONHBASEXP:: ; d0c1 +wMonHBaseEXP:: ; d0c1 ds 1 -W_MONHSPRITEDIM:: ; d0c2 +wMonHSpriteDim:: ; d0c2 ds 1 -W_MONHFRONTSPRITE:: ; d0c3 +wMonHFrontSprite:: ; d0c3 ds 2 -W_MONHBACKSPRITE:: ; d0c5 +wMonHBackSprite:: ; d0c5 ds 2 -W_MONHMOVES:: ; d0c7 - ds 4 +wMonHMoves:: ; d0c7 + ds NUM_MOVES -W_MONHGROWTHRATE:: ; d0cb +wMonHGrowthRate:: ; d0cb ds 1 -W_MONHLEARNSET:: ; d0cc +wMonHLearnset:: ; d0cc ; bit field flag_array 50 + 5 ds 1 @@ -2030,10 +2032,8 @@ wSavedTilesetType:: ; d0d4 ds 2 -W_MONHPADDING:: ; d0d7 - -W_DAMAGE:: ; d0d7 +wDamage:: ; d0d7 ds 2 ds 2 @@ -2120,7 +2120,7 @@ wTextBoxID:: ; d125 wd126:: ds 1 ; not exactly sure what this is used for, but it seems to be used as a multipurpose temp flag value -W_CURENEMYLVL:: ; d127 +wCurEnemyLVL:: ; d127 ds 1 wItemListPointer:: ; d128 @@ -2198,11 +2198,11 @@ wNumberOfNoRandomBattleStepsLeft:: ; d13c ; after a battle, you have at least 3 steps before a random battle can occur ds 1 -W_PRIZE1:: ; d13d +wPrize1:: ; d13d ds 1 -W_PRIZE2:: ; d13e +wPrize2:: ; d13e ds 1 -W_PRIZE3:: ; d13f +wPrize3:: ; d13f ds 1 ds 1 @@ -2291,10 +2291,10 @@ wBagItems:: ; d31e wPlayerMoney:: ; d347 ds 3 ; BCD -W_RIVALNAME:: ; d34a +wRivalName:: ; d34a ds NAME_LENGTH -W_OPTIONS:: ; d355 +wOptions:: ; d355 ; bit 7 = battle animation ; 0: On ; 1: Off @@ -2307,7 +2307,7 @@ W_OPTIONS:: ; d355 ; 5: Slow ds 1 -W_OBTAINEDBADGES:: ; d356 +wObtainedBadges:: ; d356 ds 1 ds 1 @@ -2333,25 +2333,25 @@ wMapPalOffset:: ; d35d ; normally, it is 0. it is 6 when Flash is needed, causing FadePal2 to be used instead of FadePal4 ds 1 -W_CURMAP:: ; d35e +wCurMap:: ; d35e ds 1 wCurrentTileBlockMapViewPointer:: ; d35f ; pointer to the upper left corner of the current view in the tile block map ds 2 -W_YCOORD:: ; d361 +wYCoord:: ; d361 ; player’s position on the current map ds 1 -W_XCOORD:: ; d362 +wXCoord:: ; d362 ds 1 -W_YBLOCKCOORD:: ; d363 +wYBlockCoord:: ; d363 ; player's y position (by block) ds 1 -W_XBLOCKCOORD:: ; d364 +wXBlockCoord:: ; d364 ds 1 wLastMap:: ; d365 @@ -2360,31 +2360,31 @@ wLastMap:: ; d365 wUnusedD366:: ; d366 ds 1 -W_CURMAPTILESET:: ; d367 +wCurMapTileset:: ; d367 ds 1 -W_CURMAPHEIGHT:: ; d368 +wCurMapHeight:: ; d368 ; blocks ds 1 -W_CURMAPWIDTH:: ; d369 +wCurMapWidth:: ; d369 ; blocks ds 1 -W_MAPDATAPTR:: ; d36a +wMapDataPtr:: ; d36a ds 2 -W_MAPTEXTPTR:: ; d36c +wMapTextPtr:: ; d36c ds 2 -W_MAPSCRIPTPTR:: ; d36e +wMapScriptPtr:: ; d36e ds 2 -W_MAPCONNECTIONS:: ; d370 +wMapConnections:: ; d370 ; connection byte ds 1 -W_MAPCONN1PTR:: ; d371 +wMapConn1Ptr:: ; d371 ds 1 wNorthConnectionStripSrc:: ; d372 @@ -2408,7 +2408,7 @@ wNorthConnectedMapXAlignment:: ; d379 wNorthConnectedMapViewPointer:: ; d37a ds 2 -W_MAPCONN2PTR:: ; d37c +wMapConn2Ptr:: ; d37c ds 1 wSouthConnectionStripSrc:: ; d37d @@ -2432,7 +2432,7 @@ wSouthConnectedMapXAlignment:: ; d384 wSouthConnectedMapViewPointer:: ; d385 ds 2 -W_MAPCONN3PTR:: ; d387 +wMapConn3Ptr:: ; d387 ds 1 wWestConnectionStripSrc:: ; d388 @@ -2456,7 +2456,7 @@ wWestConnectedMapXAlignment:: ; d38f wWestConnectedMapViewPointer:: ; d390 ds 2 -W_MAPCONN4PTR:: ; d392 +wMapConn4Ptr:: ; d392 ds 1 wEastConnectionStripSrc:: ; d393 @@ -2480,11 +2480,11 @@ wEastConnectedMapXAlignment:: ; d39a wEastConnectedMapViewPointer:: ; d39b ds 2 -W_SPRITESET:: ; d39d +wSpriteSet:: ; d39d ; sprite set for the current map (11 sprite picture ID's) ds 11 -W_SPRITESETID:: ; d3a8 +wSpriteSetID:: ; d3a8 ; sprite set ID for the current map ds 1 @@ -2523,7 +2523,7 @@ wSignCoords:: ; d4b1 wSignTextIDs:: ; d4d1 ds 16 -W_NUMSPRITES:: ; d4e1 +wNumSprites:: ; d4e1 ; number of sprites on the current map ds 1 @@ -2534,11 +2534,11 @@ wYOffsetSinceLastSpecialWarp:: ; d4e2 wXOffsetSinceLastSpecialWarp:: ; d4e3 ds 1 -W_MAPSPRITEDATA:: ; d4e4 +wMapSpriteData:: ; d4e4 ; two bytes per sprite (movement byte 2, text ID) ds 32 -W_MAPSPRITEEXTRADATA:: ; d504 +wMapSpriteExtraData:: ; d504 ; two bytes per sprite (trainer class/item ID, trainer set ID) ds 32 @@ -2572,24 +2572,24 @@ wPlayerDirection:: ; d52a ; if the player is not moving, the last the direction in which the player moved ds 1 -W_TILESETBANK:: ; d52b +wTileSetBank:: ; d52b ds 1 -W_TILESETBLOCKSPTR:: ; d52c +wTileSetBlocksPtr:: ; d52c ; maps blocks (4x4 tiles) to tiles ds 2 -W_TILESETGFXPTR:: ; d52e +wTileSetGFXPtr:: ; d52e ds 2 -W_TILESETCOLLISIONPTR:: ; d530 +wTileSetCollisionPtr:: ; d530 ; list of all walkable tiles ds 2 -W_TILESETTALKINGOVERTILES:: ; d532 +wTileSetTalkingOverTiles:: ; d532 ds 3 -W_GRASSTILE:: ; d535 +wGrassTile:: ; d535 ds 1 ds 4 @@ -2616,7 +2616,7 @@ wUnusedD5A3:: ; d5a3 wPlayerCoins:: ; d5a4 ds 2 ; BCD -W_MISSABLEOBJECTFLAGS:: ; d5a6 +wMissableObjectFlags:: ; d5a6 ; bit array of missable objects. set = removed ds 32 wMissableObjectFlagsEnd:: @@ -2625,225 +2625,225 @@ wMissableObjectFlagsEnd:: wd5cd:: ds 1 ; temp copy of c1x2 (sprite facing/anim) -W_MISSABLEOBJECTLIST:: ; d5ce +wMissableObjectList:: ; d5ce ; each entry consists of 2 bytes ; * the sprite ID (depending on the current map) -; * the missable object index (global, used for W_MISSABLEOBJECTFLAGS) +; * the missable object index (global, used for wMissableObjectFlags) ; terminated with $FF ds 17 * 2 -W_GAMEPROGRESSFLAGS:: ; d5f0 +wGameProgressFlags:: ; d5f0 ; $c8 bytes ds 0 -W_OAKSLABCURSCRIPT:: ; d5f0 +wOaksLabCurScript:: ; d5f0 ds 1 -W_PALLETTOWNCURSCRIPT:: ; d5f1 +wPalletTownCurScript:: ; d5f1 ds 1 ds 1 -W_BLUESHOUSECURSCRIPT:: ; d5f3 +wBluesHouseCurScript:: ; d5f3 ds 1 -W_VIRIDIANCITYCURSCRIPT:: ; d5f4 +wViridianCityCurScript:: ; d5f4 ds 1 ds 2 -W_PEWTERCITYCURSCRIPT:: ; d5f7 +wPewterCityCurScript:: ; d5f7 ds 1 -W_ROUTE3CURSCRIPT:: ; d5f8 +wRoute3CurScript:: ; d5f8 ds 1 -W_ROUTE4CURSCRIPT:: ; d5f9 +wRoute4CurScript:: ; d5f9 ds 1 ds 1 -W_VIRIDIANGYMCURSCRIPT:: ; d5fb +wViridianGymCurScript:: ; d5fb ds 1 -W_PEWTERGYMCURSCRIPT:: ; d5fc +wPewterGymCurScript:: ; d5fc ds 1 -W_CERULEANGYMCURSCRIPT:: ; d5fd +wCeruleanGymCurScript:: ; d5fd ds 1 -W_VERMILIONGYMCURSCRIPT:: ; d5fe +wVermilionGymCurScript:: ; d5fe ds 1 -W_CELADONGYMCURSCRIPT:: ; d5ff +wCeladonGymCurScript:: ; d5ff ds 1 -W_ROUTE6CURSCRIPT:: ; d600 +wRoute6CurScript:: ; d600 ds 1 -W_ROUTE8CURSCRIPT:: ; d601 +wRoute8CurScript:: ; d601 ds 1 -W_ROUTE24CURSCRIPT:: ; d602 +wRoute24CurScript:: ; d602 ds 1 -W_ROUTE25CURSCRIPT:: ; d603 +wRoute25CurScript:: ; d603 ds 1 -W_ROUTE9CURSCRIPT:: ; d604 +wRoute9CurScript:: ; d604 ds 1 -W_ROUTE10CURSCRIPT:: ; d605 +wRoute10CurScript:: ; d605 ds 1 -W_MTMOON1CURSCRIPT:: ; d606 +wMtMoon1CurScript:: ; d606 ds 1 -W_MTMOON3CURSCRIPT:: ; d607 +wMtMoon3CurScript:: ; d607 ds 1 -W_SSANNE8CURSCRIPT:: ; d608 +wSSAnne8CurScript:: ; d608 ds 1 -W_SSANNE9CURSCRIPT:: ; d609 +wSSAnne9CurScript:: ; d609 ds 1 -W_ROUTE22CURSCRIPT:: ; d60a +wRoute22CurScript:: ; d60a ds 1 ds 1 -W_REDSHOUSE2CURSCRIPT:: ; d60c +wRedsHouse2CurScript:: ; d60c ds 1 -W_VIRIDIANMARKETCURSCRIPT:: ; d60d +wViridianMarketCurScript:: ; d60d ds 1 -W_ROUTE22GATECURSCRIPT:: ; d60e +wRoute22GateCurScript:: ; d60e ds 1 -W_CERULEANCITYCURSCRIPT:: ; d60f +wCeruleanCityCurScript:: ; d60f ds 1 ds 7 -W_SSANNE5CURSCRIPT:: ; d617 +wSSAnne5CurScript:: ; d617 ds 1 -W_VIRIDIANFORESTCURSCRIPT:: ; d618 +wViridianForestCurScript:: ; d618 ds 1 -W_MUSEUM1FCURSCRIPT:: ; d619 +wMuseum1fCurScript:: ; d619 ds 1 -W_ROUTE13CURSCRIPT:: ; d61a +wRoute13CurScript:: ; d61a ds 1 -W_ROUTE14CURSCRIPT:: ; d61b +wRoute14CurScript:: ; d61b ds 1 -W_ROUTE17CURSCRIPT:: ; d61c +wRoute17CurScript:: ; d61c ds 1 -W_ROUTE19CURSCRIPT:: ; d61d +wRoute19CurScript:: ; d61d ds 1 -W_ROUTE21CURSCRIPT:: ; d61e +wRoute21CurScript:: ; d61e ds 1 -W_SAFARIZONEENTRANCECURSCRIPT:: ; d61f +wSafariZoneEntranceCurScript:: ; d61f ds 1 -W_ROCKTUNNEL2CURSCRIPT:: ; d620 +wRockTunnel2CurScript:: ; d620 ds 1 -W_ROCKTUNNEL1CURSCRIPT:: ; d621 +wRockTunnel1CurScript:: ; d621 ds 1 ds 1 -W_ROUTE11CURSCRIPT:: ; d623 +wRoute11CurScript:: ; d623 ds 1 -W_ROUTE12CURSCRIPT:: ; d624 +wRoute12CurScript:: ; d624 ds 1 -W_ROUTE15CURSCRIPT:: ; d625 +wRoute15CurScript:: ; d625 ds 1 -W_ROUTE16CURSCRIPT:: ; d626 +wRoute16CurScript:: ; d626 ds 1 -W_ROUTE18CURSCRIPT:: ; d627 +wRoute18CurScript:: ; d627 ds 1 -W_ROUTE20CURSCRIPT:: ; d628 +wRoute20CurScript:: ; d628 ds 1 -W_SSANNE10CURSCRIPT:: ; d629 +wSSAnne10CurScript:: ; d629 ds 1 -W_VERMILIONCITYCURSCRIPT:: ; d62a +wVermilionCityCurScript:: ; d62a ds 1 -W_POKEMONTOWER2CURSCRIPT:: ; d62b +wPokemonTower2CurScript:: ; d62b ds 1 -W_POKEMONTOWER3CURSCRIPT:: ; d62c +wPokemonTower3CurScript:: ; d62c ds 1 -W_POKEMONTOWER4CURSCRIPT:: ; d62d +wPokemonTower4CurScript:: ; d62d ds 1 -W_POKEMONTOWER5CURSCRIPT:: ; d62e +wPokemonTower5CurScript:: ; d62e ds 1 -W_POKEMONTOWER6CURSCRIPT:: ; d62f +wPokemonTower6CurScript:: ; d62f ds 1 -W_POKEMONTOWER7CURSCRIPT:: ; d630 +wPokemonTower7CurScript:: ; d630 ds 1 -W_ROCKETHIDEOUT1CURSCRIPT:: ; d631 +wRocketHideout1CurScript:: ; d631 ds 1 -W_ROCKETHIDEOUT2CURSCRIPT:: ; d632 +wRocketHideout2CurScript:: ; d632 ds 1 -W_ROCKETHIDEOUT3CURSCRIPT:: ; d633 +wRocketHideout3CurScript:: ; d633 ds 1 -W_ROCKETHIDEOUT4CURSCRIPT:: ; d634 +wRocketHideout4CurScript:: ; d634 ds 2 -W_ROUTE6GATECURSCRIPT:: ; d636 +wRoute6GateCurScript:: ; d636 ds 1 -W_ROUTE8GATECURSCRIPT:: ; d637 +wRoute8GateCurScript:: ; d637 ds 2 -W_CINNABARISLANDCURSCRIPT:: ; d639 +wCinnabarIslandCurScript:: ; d639 ds 1 -W_MANSION1CURSCRIPT:: ; d63a +wMansion1CurScript:: ; d63a ds 2 -W_MANSION2CURSCRIPT:: ; d63c +wMansion2CurScript:: ; d63c ds 1 -W_MANSION3CURSCRIPT:: ; d63d +wMansion3CurScript:: ; d63d ds 1 -W_MANSION4CURSCRIPT:: ; d63e +wMansion4CurScript:: ; d63e ds 1 -W_VICTORYROAD2CURSCRIPT:: ; d63f +wVictoryRoad2CurScript:: ; d63f ds 1 -W_VICTORYROAD3CURSCRIPT:: ; d640 +wVictoryRoad3CurScript:: ; d640 ds 2 -W_FIGHTINGDOJOCURSCRIPT:: ; d642 +wFightingDojoCurScript:: ; d642 ds 1 -W_SILPHCO2CURSCRIPT:: ; d643 +wSilphCo2CurScript:: ; d643 ds 1 -W_SILPHCO3CURSCRIPT:: ; d644 +wSilphCo3CurScript:: ; d644 ds 1 -W_SILPHCO4CURSCRIPT:: ; d645 +wSilphCo4CurScript:: ; d645 ds 1 -W_SILPHCO5CURSCRIPT:: ; d646 +wSilphCo5CurScript:: ; d646 ds 1 -W_SILPHCO6CURSCRIPT:: ; d647 +wSilphCo6CurScript:: ; d647 ds 1 -W_SILPHCO7CURSCRIPT:: ; d648 +wSilphCo7CurScript:: ; d648 ds 1 -W_SILPHCO8CURSCRIPT:: ; d649 +wSilphCo8CurScript:: ; d649 ds 1 -W_SILPHCO9CURSCRIPT:: ; d64a +wSilphCo9CurScript:: ; d64a ds 1 -W_HALLOFFAMEROOMCURSCRIPT:: ; d64b +wHallOfFameRoomCurScript:: ; d64b ds 1 -W_GARYCURSCRIPT:: ; d64c +wGaryCurScript:: ; d64c ds 1 -W_LORELEICURSCRIPT:: ; d64d +wLoreleiCurScript:: ; d64d ds 1 -W_BRUNOCURSCRIPT:: ; d64e +wBrunoCurScript:: ; d64e ds 1 -W_AGATHACURSCRIPT:: ; d64f +wAgathaCurScript:: ; d64f ds 1 -W_UNKNOWNDUNGEON3CURSCRIPT:: ; d650 +wUnknownDungeon3CurScript:: ; d650 ds 1 -W_VICTORYROAD1CURSCRIPT:: ; d651 +wVictoryRoad1CurScript:: ; d651 ds 1 ds 1 -W_LANCECURSCRIPT:: ; d653 +wLanceCurScript:: ; d653 ds 1 ds 4 -W_SILPHCO10CURSCRIPT:: ; d658 +wSilphCo10CurScript:: ; d658 ds 1 -W_SILPHCO11CURSCRIPT:: ; d659 +wSilphCo11CurScript:: ; d659 ds 1 ds 1 -W_FUCHSIAGYMCURSCRIPT:: ; d65b +wFuchsiaGymCurScript:: ; d65b ds 1 -W_SAFFRONGYMCURSCRIPT:: ; d65c +wSaffronGymCurScript:: ; d65c ds 1 ds 1 -W_CINNABARGYMCURSCRIPT:: ; d65e +wCinnabarGymCurScript:: ; d65e ds 1 -W_CELADONGAMECORNERCURSCRIPT:: ; d65f +wCeladonGameCornerCurScript:: ; d65f ds 1 -W_ROUTE16GATECURSCRIPT:: ; d660 +wRoute16GateCurScript:: ; d660 ds 1 -W_BILLSHOUSECURSCRIPT:: ; d661 +wBillsHouseCurScript:: ; d661 ds 1 -W_ROUTE5GATECURSCRIPT:: ; d662 +wRoute5GateCurScript:: ; d662 ds 1 -W_POWERPLANTCURSCRIPT:: ; d663 +wPowerPlantCurScript:: ; d663 ; overload ds 0 -W_ROUTE7GATECURSCRIPT:: ; d663 +wRoute7GateCurScript:: ; d663 ; overload ds 1 ds 1 -W_SSANNE2CURSCRIPT:: ; d665 +wSSAnne2CurScript:: ; d665 ds 1 -W_SEAFOAMISLANDS4CURSCRIPT:: ; d666 +wSeafoamIslands4CurScript:: ; d666 ds 1 -W_ROUTE23CURSCRIPT:: ; d667 +wRoute23CurScript:: ; d667 ds 1 -W_SEAFOAMISLANDS5CURSCRIPT:: ; d668 +wSeafoamIslands5CurScript:: ; d668 ds 1 -W_ROUTE18GATECURSCRIPT:: ; d669 +wRoute18GateCurScript:: ; d669 ds 1 ds 78 @@ -2865,36 +2865,36 @@ wWalkBikeSurfState:: ; d700 ds 10 -W_TOWNVISITEDFLAG:: ; d70b +wTownVisitedFlag:: ; d70b flag_array 13 wSafariSteps:: ; d70d ; starts at 502 ds 2 -W_FOSSILITEM:: ; d70f +wFossilItem:: ; d70f ; item given to cinnabar lab ds 1 -W_FOSSILMON:: ; d710 +wFossilMon:: ; d710 ; mon that will result from the item ds 1 ds 2 -W_ENEMYMONORTRAINERCLASS:: ; d713 +wEnemyMonOrTrainerClass:: ; d713 ; trainer classes start at 200 ds 1 wPlayerJumpingYScreenCoordsIndex:: ; d714 ds 1 -W_RIVALSTARTER:: ; d715 +wRivalStarter:: ; d715 ds 1 ds 1 -W_PLAYERSTARTER:: ; d717 +wPlayerStarter:: ; d717 ds 1 wBoulderSpriteIndex:: ; d718 @@ -2942,7 +2942,7 @@ wd728:: ; d728 ds 1 wBeatGymFlags:: ; d72a -; redundant because it matches W_OBTAINEDBADGES +; redundant because it matches wObtainedBadges ; used to determine whether to show name on statue and in two NPC text scripts ds 1 @@ -3002,12 +3002,12 @@ wd732:: ; d732 ; bit 6: map destination is [wLastBlackoutMap] (usually the last used pokemon center, but could be the player's house) ds 1 -W_FLAGS_D733:: ; d733 +wFlags_D733:: ; d733 ; bit 0: running a test battle ; bit 1: prevent music from changing when entering new map ; bit 2: skip the joypad check in CheckWarpsNoCollision (used for the forced warp down the waterfall in the Seafoam Islands) ; bit 3: trainer wants to battle -; bit 4: use variable [W_CURMAPSCRIPT] instead of the provided index for next frame's map script (used to start battle when talking to trainers) +; bit 4: use variable [wCurMapScript] instead of the provided index for next frame's map script (used to start battle when talking to trainers) ; bit 7: used fly out of battle ds 1 @@ -3058,10 +3058,10 @@ wEventFlags:: ; d747 wLinkEnemyTrainerName:: ; d887 ; linked game's trainer name -W_GRASSRATE:: ; d887 +wGrassRate:: ; d887 ds 1 -W_GRASSMONS:: ; d888 +wGrassMons:: ; d888 ds 20 wEnemyPartyCount:: ds 1 ; d89c @@ -3079,7 +3079,7 @@ wEnemyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d9ac wEnemyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH ; d9ee -W_TRAINERHEADERPTR:: ; da30 +wTrainerHeaderPtr:: ; da30 ds 2 ds 6 @@ -3091,36 +3091,36 @@ wOpponentAfterWrongAnswer:: ; da38 wUnusedDA38:: ; da38 ds 1 -W_CURMAPSCRIPT:: ; da39 +wCurMapScript:: ; da39 ; index of current map script, mostly used as index for function pointer array ; mostly copied from map-specific map script pointer and wirtten back later ds 1 ds 6 -W_PLAYTIMEHOURS:: ; da40 +wPlayTimeHours:: ; da40 ds 2 -W_PLAYTIMEMINUTES:: ; da42 +wPlayTimeMinutes:: ; da42 ds 2 -W_PLAYTIMESECONDS:: ; da44 +wPlayTimeSeconds:: ; da44 ds 1 -W_PLAYTIMEFRAMES:: ; da45 +wPlayTimeFrames:: ; da45 ds 1 wSafariZoneGameOver:: ; da46 ds 1 -W_NUMSAFARIBALLS:: ; da47 +wNumSafariBalls:: ; da47 ds 1 -W_DAYCARE_IN_USE:: ; da48 +wDayCareInUse:: ; da48 ; 0 if no pokemon is in the daycare ; 1 if pokemon is in the daycare ds 1 -W_DAYCAREMONNAME:: ds NAME_LENGTH ; da49 -W_DAYCAREMONOT:: ds NAME_LENGTH ; da54 +wDayCareMonName:: ds NAME_LENGTH ; da49 +wDayCareMonOT:: ds NAME_LENGTH ; da54 wDayCareMon:: box_struct wDayCareMon ; da5f @@ -3129,7 +3129,7 @@ wMainDataEnd:: wBoxDataStart:: -W_NUMINBOX:: ds 1 ; da80 +wNumInBox:: ds 1 ; da80 wBoxSpecies:: ds MONS_PER_BOX + 1 wBoxMons:: -- cgit v1.3.1-sl0p From 5facf8377aeda68cb3fca389cb1784cf9c2d406b Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 30 Aug 2015 22:04:08 -0500 Subject: No more wram_constants.asm unfortunately, this means manually declaring the wEnemyMon1 party struct --- constants.asm | 2 -- constants/misc_constants.asm | 2 ++ constants/wram_constants.asm | 10 ---------- engine/battle/wild_encounters.asm | 4 ++-- main.asm | 4 ++-- wram.asm | 40 +++++++++++++++++++++++++++++++++++++-- 6 files changed, 44 insertions(+), 18 deletions(-) delete mode 100644 constants/wram_constants.asm diff --git a/constants.asm b/constants.asm index 3b2d8437..090799f9 100644 --- a/constants.asm +++ b/constants.asm @@ -7,8 +7,6 @@ INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/oam_constants.asm" INCLUDE "constants/misc_constants.asm" -INCLUDE "constants/wram_constants.asm" - INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokedex_constants.asm" INCLUDE "constants/trainer_constants.asm" diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index c9240ad7..de777c5d 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -38,6 +38,8 @@ SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8 BG_MAP_WIDTH EQU 32 BG_MAP_HEIGHT EQU 32 +SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile) + NPC_MOVEMENT_DOWN EQU $00 NPC_MOVEMENT_UP EQU $40 NPC_MOVEMENT_LEFT EQU $80 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm deleted file mode 100644 index b6939a3e..00000000 --- a/constants/wram_constants.asm +++ /dev/null @@ -1,10 +0,0 @@ - -SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile) - -; Overload wGrassMons -wSerialEnemyDataBlock EQU $d893 ; wGrassMons + 11 - -; Overload enemy party data -W_WATERRATE EQU $d8a4 ; wEnemyMon1Species -W_WATERMONS EQU $d8a5 ; wEnemyMon1Species + 1 - diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 5e553129..044f7ea5 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -33,7 +33,7 @@ TryDoWildEncounter: ; 13870 (4:7870) jr z, .CanEncounter ld a, $14 ; in all tilesets with a water tile, this is its id cp c - ld a, [W_WATERRATE] + ld a, [wWaterRate] jr z, .CanEncounter ; even if not in grass/water, standing anywhere we can encounter pokemon ; so long as the map is "indoor" and has wild pokemon defined. @@ -67,7 +67,7 @@ TryDoWildEncounter: ; 13870 (4:7870) aCoord 8, 9 cp $14 ; is the bottom left tile (8,9) of the half-block we're standing in a water tile? jr nz, .gotWildEncounterType ; else, it's treated as a grass tile by default - ld hl, W_WATERMONS + ld hl, wWaterMons ; since the bottom right tile of a "left shore" half-block is $14 but the bottom left tile is not, ; "left shore" half-blocks (such as the one in the east coast of Cinnabar) load grass encounters. .gotWildEncounterType diff --git a/main.asm b/main.asm index fb7e2045..8049b646 100755 --- a/main.asm +++ b/main.asm @@ -2967,10 +2967,10 @@ LoadWildData: ; ceb8 (3:4eb8) add hl,bc .NoGrassData ld a,[hli] - ld [W_WATERRATE],a + ld [wWaterRate],a and a ret z ; if no water data, we're done - ld de,W_WATERMONS ; otherwise, load surfing data + ld de,wWaterMons ; otherwise, load surfing data ld bc,$0014 jp CopyData diff --git a/wram.asm b/wram.asm index 98526be0..3dfafc0c 100755 --- a/wram.asm +++ b/wram.asm @@ -3062,13 +3062,49 @@ wGrassRate:: ; d887 ds 1 wGrassMons:: ; d888 - ds 20 + ;ds 20 + + ds 11 +; Overload wGrassMons +wSerialEnemyDataBlock:: ; d893 + ds 9 wEnemyPartyCount:: ds 1 ; d89c wEnemyPartyMons:: ds PARTY_LENGTH + 1 ; d89d wEnemyMons:: ; d8a4 -wEnemyMon1:: party_struct wEnemyMon1 +wEnemyMon1:: +wEnemyMon1Species:: + +; Overload enemy party data +wWaterRate:: db ; d8a4 +wWaterMons:: ; d8a5 + +wEnemyMon1HP:: dw +wEnemyMon1BoxLevel:: db +wEnemyMon1Status:: db +wEnemyMon1Type:: +wEnemyMon1Type1:: db +wEnemyMon1Type2:: db +wEnemyMon1CatchRate:: db +wEnemyMon1Moves:: ds NUM_MOVES +wEnemyMon1OTID:: dw +wEnemyMon1Exp:: ds 3 +wEnemyMon1HPExp:: dw +wEnemyMon1AttackExp:: dw +wEnemyMon1DefenseExp:: dw +wEnemyMon1SpeedExp:: dw +wEnemyMon1SpecialExp:: dw +wEnemyMon1DVs:: ds 2 +wEnemyMon1PP:: ds NUM_MOVES +wEnemyMon1Level:: db +wEnemyMon1Stats:: +wEnemyMon1MaxHP:: dw +wEnemyMon1Attack:: dw +wEnemyMon1Defense:: dw +wEnemyMon1Speed:: dw +wEnemyMon1Special:: dw + wEnemyMon2:: party_struct wEnemyMon2 wEnemyMon3:: party_struct wEnemyMon3 wEnemyMon4:: party_struct wEnemyMon4 -- cgit v1.3.1-sl0p From 8026d4758565c1ae427a9995c840d8b8dbc8352b Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 30 Aug 2015 22:15:32 -0500 Subject: No more S_ --- engine/battle/core.asm | 2 +- engine/battle/scale_sprites.asm | 8 ++++---- engine/hall_of_fame.asm | 4 ++-- engine/oak_speech.asm | 4 ++-- home.asm | 22 +++++++++++----------- home/pic.asm | 22 +++++++++++----------- sram.asm | 6 +++--- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 56ea5a20..2dc34e52 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6457,7 +6457,7 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) xor a ld [$4000], a ld hl, vSprites - ld de, S_SPRITEBUFFER1 + ld de, sSpriteBuffer1 ld a, [H_LOADEDROMBANK] ld b, a ld c, 7 * 7 diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm index ed227984..6a8d43a9 100644 --- a/engine/battle/scale_sprites.asm +++ b/engine/battle/scale_sprites.asm @@ -2,12 +2,12 @@ ; assumes that input sprite chunks are 4x4 tiles, and the rightmost and bottommost 4 pixels will be ignored ; resulting in a 7*7 tile output sprite chunk ScaleSpriteByTwo: ; 2fe40 (b:7e40) - ld de, S_SPRITEBUFFER1 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped - ld hl, S_SPRITEBUFFER0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer + ld de, sSpriteBuffer1 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped + ld hl, sSpriteBuffer0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer call ScaleLastSpriteColumnByTwo ; last tile column is special case call ScaleFirstThreeSpriteColumnsByTwo ; scale first 3 tile columns - ld de, S_SPRITEBUFFER2 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped - ld hl, S_SPRITEBUFFER1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer + ld de, sSpriteBuffer2 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped + ld hl, sSpriteBuffer1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer call ScaleLastSpriteColumnByTwo ; last tile column is special case ScaleFirstThreeSpriteColumnsByTwo: ; 2fe55 (b:7e55) diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 75cbeb2c..73c4918b 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -186,8 +186,8 @@ HoFLoadPlayerPics: ; 7033e (1c:433e) ld de, RedPicFront ld a, BANK(RedPicFront) call UncompressSpriteFromDE - ld hl, S_SPRITEBUFFER1 - ld de, S_SPRITEBUFFER0 + ld hl, sSpriteBuffer1 + ld de, sSpriteBuffer0 ld bc, $310 call CopyData ld de, vFrontPic diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index d5f13a7a..c4d35639 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -215,8 +215,8 @@ IntroDisplayPicCenteredOrUpperRight: ; 62a4 (1:62a4) push bc ld a,b call UncompressSpriteFromDE - ld hl,S_SPRITEBUFFER1 - ld de,S_SPRITEBUFFER0 + ld hl,sSpriteBuffer1 + ld de,sSpriteBuffer0 ld bc,$310 call CopyData ld de,vFrontPic diff --git a/home.asm b/home.asm index 0a8bb9a5..81a5fc8a 100644 --- a/home.asm +++ b/home.asm @@ -810,15 +810,15 @@ LoadUncompressedSpriteData:: ; 1672 (0:1672) ld [H_SPRITEOFFSET], a xor a ld [$4000], a - ld hl, S_SPRITEBUFFER0 + ld hl, sSpriteBuffer0 call ZeroSpriteBuffer ; zero buffer 0 - ld de, S_SPRITEBUFFER1 - ld hl, S_SPRITEBUFFER0 + ld de, sSpriteBuffer1 + ld hl, sSpriteBuffer0 call AlignSpriteDataCentered ; copy and align buffer 1 to 0 (containing the MSB of the 2bpp sprite) - ld hl, S_SPRITEBUFFER1 + ld hl, sSpriteBuffer1 call ZeroSpriteBuffer ; zero buffer 1 - ld de, S_SPRITEBUFFER2 - ld hl, S_SPRITEBUFFER1 + ld de, sSpriteBuffer2 + ld hl, sSpriteBuffer1 call AlignSpriteDataCentered ; copy and align buffer 2 to 1 (containing the LSB of the 2bpp sprite) pop de jp InterlaceMergeSpriteBuffers @@ -869,9 +869,9 @@ InterlaceMergeSpriteBuffers:: ; 16ea (0:16ea) xor a ld [$4000], a push de - ld hl, S_SPRITEBUFFER2 + (SPRITEBUFFERSIZE - 1) ; destination: end of buffer 2 - ld de, S_SPRITEBUFFER1 + (SPRITEBUFFERSIZE - 1) ; source 2: end of buffer 1 - ld bc, S_SPRITEBUFFER0 + (SPRITEBUFFERSIZE - 1) ; source 1: end of buffer 0 + ld hl, sSpriteBuffer2 + (SPRITEBUFFERSIZE - 1) ; destination: end of buffer 2 + ld de, sSpriteBuffer1 + (SPRITEBUFFERSIZE - 1) ; source 2: end of buffer 1 + ld bc, sSpriteBuffer0 + (SPRITEBUFFERSIZE - 1) ; source 1: end of buffer 0 ld a, SPRITEBUFFERSIZE/2 ; $c4 ld [H_SPRITEINTERLACECOUNTER], a .interlaceLoop @@ -895,7 +895,7 @@ InterlaceMergeSpriteBuffers:: ; 16ea (0:16ea) and a jr z, .notFlipped ld bc, 2*SPRITEBUFFERSIZE - ld hl, S_SPRITEBUFFER1 + ld hl, sSpriteBuffer1 .swapLoop swap [hl] ; if flipped swap nybbles in all bytes inc hl @@ -905,7 +905,7 @@ InterlaceMergeSpriteBuffers:: ; 16ea (0:16ea) jr nz, .swapLoop .notFlipped pop hl - ld de, S_SPRITEBUFFER1 + ld de, sSpriteBuffer1 ld c, (2*SPRITEBUFFERSIZE)/16 ; $31, number of 16 byte chunks to be copied ld a, [H_LOADEDROMBANK] ld b, a diff --git a/home/pic.asm b/home/pic.asm index 81629055..4af12117 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -19,7 +19,7 @@ UncompressSpriteData:: ; 24fd (0:24fd) ; initializes necessary data to load a sprite and runs UncompressSpriteDataLoop _UncompressSpriteData:: ; 251a (0:251a) - ld hl, S_SPRITEBUFFER1 + ld hl, sSpriteBuffer1 ld c, (2*SPRITEBUFFERSIZE) % $100 ld b, (2*SPRITEBUFFERSIZE) / $100 xor a @@ -48,19 +48,19 @@ _UncompressSpriteData:: ; 251a (0:251a) ld [wSpriteWidth], a call ReadNextInputBit ld [wSpriteLoadFlags], a ; initialite bit1 to 0 and bit0 to the first input bit - ; this will load two chunks of data to S_SPRITEBUFFER1 and S_SPRITEBUFFER2 + ; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2 ; bit 0 decides in which one the first chunk is placed ; fall through -; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into S_SPRITEBUFFER1 or S_SPRITEBUFFER2 +; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into sSpriteBuffer1 or sSpriteBuffer2 ; each chunk is a 1bpp sprite. A 2bpp sprite consist of two chunks which are merged afterwards ; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack UncompressSpriteDataLoop:: ; 2556 (0:2556) - ld hl, S_SPRITEBUFFER1 + ld hl, sSpriteBuffer1 ld a, [wSpriteLoadFlags] bit 0, a jr z, .useSpriteBuffer1 ; check which buffer to use - ld hl, S_SPRITEBUFFER2 + ld hl, sSpriteBuffer2 .useSpriteBuffer1 call StoreSpriteOutputPointer ld a, [wSpriteLoadFlags] @@ -290,9 +290,9 @@ UnpackSprite:: ; 26bf (0:26bf) jp z, UnpackSpriteMode2 and a jp nz, XorSpriteChunks - ld hl, S_SPRITEBUFFER1 + ld hl, sSpriteBuffer1 call SpriteDifferentialDecode - ld hl, S_SPRITEBUFFER2 + ld hl, sSpriteBuffer2 ; fall through ; decodes differential encoded sprite data @@ -542,12 +542,12 @@ ResetSpriteBufferPointers:: ; 2841 (0:2841) ld a, [wSpriteLoadFlags] bit 0, a jr nz, .buffer2Selected - ld de, S_SPRITEBUFFER1 - ld hl, S_SPRITEBUFFER2 + ld de, sSpriteBuffer1 + ld hl, sSpriteBuffer2 jr .storeBufferPointers .buffer2Selected - ld de, S_SPRITEBUFFER2 - ld hl, S_SPRITEBUFFER1 + ld de, sSpriteBuffer2 + ld hl, sSpriteBuffer1 .storeBufferPointers ld a, l ld [wSpriteOutputPtr], a diff --git a/sram.asm b/sram.asm index 9f49d9ca..3e7b3e16 100644 --- a/sram.asm +++ b/sram.asm @@ -1,8 +1,8 @@ SECTION "Sprite Buffers", SRAM, BANK[0] -S_SPRITEBUFFER0:: ds SPRITEBUFFERSIZE ; a000 -S_SPRITEBUFFER1:: ds SPRITEBUFFERSIZE ; a188 -S_SPRITEBUFFER2:: ds SPRITEBUFFERSIZE ; a310 +sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 +sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 +sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 ds $100 -- cgit v1.3.1-sl0p From dd9b1676898862f70c3352ed46a0f9097a50450c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 4 Sep 2015 20:33:38 -0400 Subject: Rewrite SetEvents and ResetEvents for unlimited number of events --- constants/event_macros.asm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/constants/event_macros.asm b/constants/event_macros.asm index cc7c03f5..90a6a59b 100755 --- a/constants/event_macros.asm +++ b/constants/event_macros.asm @@ -163,14 +163,13 @@ event_byte = ((\1) / 8) ;\1 = event index ;\2 = event index -;\3 = event index (optional) +;\3, \4, ... = additional (optional) event indices SetEvents: MACRO SetEvent \1 + rept (_NARG + -1) SetEventReuseHL \2 - - IF _NARG > 2 - SetEventReuseHL \3 - ENDC + shift + endr ENDM ;\1 = event index @@ -214,11 +213,10 @@ event_byte = ((\1) / 8) ;\3 = event index (optional) ResetEvents: MACRO ResetEvent \1 + rept (_NARG + -1) ResetEventReuseHL \2 - - IF _NARG > 2 - ResetEventReuseHL \3 - ENDC + shift + endr ENDM ;\1 = event index -- cgit v1.3.1-sl0p From 4634304dcebf055ed0e1cab171c2d28e66399763 Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 7 Sep 2015 09:42:24 -0500 Subject: Use 'ds wWaterRate - @' to avoid manually declaring the wEnemyMon1 party struct --- wram.asm | 37 ++++++------------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) diff --git a/wram.asm b/wram.asm index 3dfafc0c..2610e59f 100755 --- a/wram.asm +++ b/wram.asm @@ -3072,39 +3072,14 @@ wSerialEnemyDataBlock:: ; d893 wEnemyPartyCount:: ds 1 ; d89c wEnemyPartyMons:: ds PARTY_LENGTH + 1 ; d89d -wEnemyMons:: ; d8a4 -wEnemyMon1:: -wEnemyMon1Species:: - ; Overload enemy party data -wWaterRate:: db ; d8a4 -wWaterMons:: ; d8a5 - -wEnemyMon1HP:: dw -wEnemyMon1BoxLevel:: db -wEnemyMon1Status:: db -wEnemyMon1Type:: -wEnemyMon1Type1:: db -wEnemyMon1Type2:: db -wEnemyMon1CatchRate:: db -wEnemyMon1Moves:: ds NUM_MOVES -wEnemyMon1OTID:: dw -wEnemyMon1Exp:: ds 3 -wEnemyMon1HPExp:: dw -wEnemyMon1AttackExp:: dw -wEnemyMon1DefenseExp:: dw -wEnemyMon1SpeedExp:: dw -wEnemyMon1SpecialExp:: dw -wEnemyMon1DVs:: ds 2 -wEnemyMon1PP:: ds NUM_MOVES -wEnemyMon1Level:: db -wEnemyMon1Stats:: -wEnemyMon1MaxHP:: dw -wEnemyMon1Attack:: dw -wEnemyMon1Defense:: dw -wEnemyMon1Speed:: dw -wEnemyMon1Special:: dw +wWaterRate:: db ; d8a4 +wWaterMons:: db ; d8a5 + ds wWaterRate - @ + +wEnemyMons:: ; d8a4 +wEnemyMon1:: party_struct wEnemyMon1 wEnemyMon2:: party_struct wEnemyMon2 wEnemyMon3:: party_struct wEnemyMon3 wEnemyMon4:: party_struct wEnemyMon4 -- cgit v1.3.1-sl0p From ed48f56e981cebcd0301a2c9c91400f58200762e Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 Oct 2015 02:44:58 -0400 Subject: Get rid of queues. For faster builds, use `make -j`. --- Makefile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 5cc485c1..58871a24 100644 --- a/Makefile +++ b/Makefile @@ -66,29 +66,21 @@ $(foreach obj, $(all_obj), \ ) -# Image files are added to a queue to reduce build time. They're converted when building parent objects. %.png: ; -%.2bpp: %.png ; $(eval 2bppq += $<) @rm -f $@ -%.1bpp: %.png ; $(eval 1bppq += $<) @rm -f $@ -%.pic: %.2bpp ; $(eval picq += $<) @rm -f $@ +%.2bpp: %.png ; @$(gfx) 2bpp $< +%.1bpp: %.png ; @$(gfx) 1bpp $< +%.pic: %.2bpp ; @$(pic) compress $< # Assemble source files into objects. -# Queue payloads are here. These are made silent since there may be hundreds of targets. -# Use rgbasm -h to use halts without nops. $(all_obj): $$*.asm $$($$*_dep) - @$(gfx) 2bpp $(2bppq); $(eval 2bppq :=) - @$(gfx) 1bpp $(1bppq); $(eval 1bppq :=) - @$(pic) compress $(picq); $(eval picq :=) rgbasm -h -o $@ $*.asm - -# Link objects together to build a rom. - # Make a symfile for debugging. -link = rgblink -n poke$*.sym +link_opt = -n poke$*.sym +# Link objects together to build a rom. poke%.gbc: $$(%_obj) - $(link) -o $@ $^ + rgblink $(link_opt) -o $@ $^ rgbfix $($*_opt) $@ -- cgit v1.3.1-sl0p From 8e96cf2ba3e76552f8015faa864a1a0313e212e3 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 Oct 2015 03:04:52 -0400 Subject: Reorganize the makefile and remove yellow targets. --- Makefile | 91 +++++++++++++++++++++++++++++----------------------------------- 1 file changed, 41 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index 58871a24..5956c8e3 100644 --- a/Makefile +++ b/Makefile @@ -1,41 +1,10 @@ -# Build Red/Blue. Yellow is WIP. -roms := pokered.gbc pokeblue.gbc - - -.PHONY: all clean red blue yellow compare - -all: $(roms) -red: pokered.gbc -blue: pokeblue.gbc -yellow: pokeyellow.gbc - -versions := red blue yellow - - -# Header options for rgbfix. -dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -cgb_opt = -cjsv -k 01 -l 0x33 -m 0x1b -p 0 -r 03 - -red_opt = $(dmg_opt) -t "POKEMON RED" -blue_opt = $(dmg_opt) -t "POKEMON BLUE" -yellow_opt = $(cgb_opt) -t "POKEMON YELLOW" - - - -# If your default python is 3, you may want to change this to python27. +# python 2.7 PYTHON := python # md5sum -c is used to compare rom hashes. The options may vary across platforms. MD5 := md5sum -c --quiet -# The compare target is a shortcut to check that the build matches the original roms exactly. -# This is for contributors to make sure a change didn't affect the contents of the rom. -# More thorough comparison can be made by diffing the output of hexdump -C against both roms. -compare: red blue - @$(MD5) roms.md5 - - # Clear the default suffixes. .SUFFIXES: .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic @@ -46,16 +15,19 @@ compare: red blue # Suppress annoying intermediate file deletion messages. .PRECIOUS: %.2bpp -# Filepath shortcuts to avoid overly long recipes. +.PHONY: all clean red blue compare + + poketools := extras/pokemontools gfx := $(PYTHON) $(poketools)/gfx.py -pic := $(PYTHON) $(poketools)/pic.py +2bpp := $(gfx) 2bpp +1bpp := $(gfx) 1bpp +pic := $(PYTHON) $(poketools)/pic.py compress includes := $(PYTHON) $(poketools)/scan_includes.py +versions := red blue - -# Collect file dependencies for objects in red/, blue/ and yellow/. -# These aren't provided by rgbds by default, so we have to look for file includes ourselves. +# Collect file dependencies for objects in red/ and blue/. $(foreach ver, $(versions), \ $(eval $(ver)_asm := $(shell find $(ver) -iname '*.asm')) \ $(eval $(ver)_obj := $($(ver)_asm:.asm=.o)) \ @@ -66,24 +38,43 @@ $(foreach obj, $(all_obj), \ ) -%.png: ; -%.2bpp: %.png ; @$(gfx) 2bpp $< -%.1bpp: %.png ; @$(gfx) 1bpp $< -%.pic: %.2bpp ; @$(pic) compress $< +roms := pokered.gbc pokeblue.gbc -# Assemble source files into objects. -$(all_obj): $$*.asm $$($$*_dep) - rgbasm -h -o $@ $*.asm +all: $(roms) +red: pokered.gbc +blue: pokeblue.gbc + +# For contributors to make sure a change didn't affect the contents of the rom. +compare: red blue + @$(MD5) roms.md5 + +clean: + rm -f $(roms) $(all_obj) $(roms:.gbc=.sym) + find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + + + +# Don't fix halts. +asm_opt = -h # Make a symfile for debugging. link_opt = -n poke$*.sym -# Link objects together to build a rom. +# Header options for rgbfix. +dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 +red_opt = $(dmg_opt) -t "POKEMON RED" +blue_opt = $(dmg_opt) -t "POKEMON BLUE" + + +%.png: ; +%.2bpp: %.png ; @$(2bpp) $< +%.1bpp: %.png ; @$(1bpp) $< +%.pic: %.2bpp ; @$(pic) $< + +# Assemble source files into objects. +$(all_obj): $$*.asm $$($$*_dep) + rgbasm $(asm_opt) -o $@ $*.asm + +# Link objects to produce a rom. poke%.gbc: $$(%_obj) rgblink $(link_opt) -o $@ $^ rgbfix $($*_opt) $@ - - -clean: - rm -f $(roms) $(all_obj) poke*.sym - find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + -- cgit v1.3.1-sl0p From 286914d0ab71074ee3edc29c10a53c8c4b80568c Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 Oct 2015 03:06:22 -0400 Subject: align spacing in previous --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5956c8e3..acca2ed0 100644 --- a/Makefile +++ b/Makefile @@ -60,9 +60,9 @@ asm_opt = -h link_opt = -n poke$*.sym # Header options for rgbfix. -dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -red_opt = $(dmg_opt) -t "POKEMON RED" -blue_opt = $(dmg_opt) -t "POKEMON BLUE" +dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 +red_opt = $(dmg_opt) -t "POKEMON RED" +blue_opt = $(dmg_opt) -t "POKEMON BLUE" %.png: ; -- cgit v1.3.1-sl0p From 79368d56beeb4682a5ba19ba23e5e10154bfc2f9 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 Oct 2015 03:20:24 -0400 Subject: use pip and apt-cyg --- INSTALL.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 11450d93..cddca1c1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,7 +1,7 @@ # Linux - sudo apt-get install make gcc bison git python python-setuptools - sudo easy_install pypng + sudo apt-get install make gcc bison git python python-pip + sudo pip install pypng git clone git://github.com/bentley/rgbds.git cd rgbds @@ -23,7 +23,7 @@ To build them individually: # Mac -In the shell, run: +In **Terminal**, run: xcode-select --install sudo easy_install pypng @@ -41,16 +41,19 @@ In the shell, run: # Windows -To build on Windows, use [**Cygwin**](http://cygwin.com/install.html) (32-bit). - -In the installer, select the following packages: `make` `git` `gettext` `python` `python-setuptools` +To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the default settings. Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/). -Put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. +Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. In the **Cygwin terminal**: - easy_install pypng + install $(lynx -source rawgit.com/transcode-open/apt-cyg/master/apt-cyg) /bin + apt-cyg install make git python gettext + + lynx -source bootstrap.pypa.io/get-pip.py | python + pip install pypng + git clone --recursive git://github.com/iimarckus/pokered.git cd pokered -- cgit v1.3.1-sl0p From f3b3e21e04ad01ff775dcb2621355287d747d73d Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 Oct 2015 03:21:27 -0400 Subject: fix repository links --- INSTALL.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index cddca1c1..c9696f72 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -3,12 +3,12 @@ sudo apt-get install make gcc bison git python python-pip sudo pip install pypng - git clone git://github.com/bentley/rgbds.git + git clone https://github.com/bentley/rgbds cd rgbds sudo make install cd .. - git clone --recursive git://github.com/iimarckus/pokered.git + git clone --recursive https://github.com/pret/pokered cd pokered To build **pokered.gbc** and **pokeblue.gbc**: @@ -28,12 +28,12 @@ In **Terminal**, run: xcode-select --install sudo easy_install pypng - git clone git://github.com/bentley/rgbds.git + git clone https://github.com/bentley/rgbds cd rgbds sudo make install cd .. - git clone --recursive git://github.com/iimarckus/pokered.git + git clone --recursive https://github.com/pret/pokered cd pokered make @@ -54,7 +54,7 @@ In the **Cygwin terminal**: lynx -source bootstrap.pypa.io/get-pip.py | python pip install pypng - git clone --recursive git://github.com/iimarckus/pokered.git + git clone --recursive https://github.com/pret/pokered cd pokered make -- cgit v1.3.1-sl0p From f33bd1d89e03b7eec679048ffdf704551b22fde0 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Sun, 6 Dec 2015 14:04:42 -0700 Subject: Improve diffability with pokeyellow; remove address comments and ifs. --- text/maps/agatha.asm | 12 +- text/maps/bike_shop.asm | 22 +- text/maps/bills_house.asm | 23 +- text/maps/blues_house.asm | 8 - text/maps/bruno.asm | 8 +- text/maps/celadon_city.asm | 56 ++-- text/maps/celadon_dept_store_1f.asm | 6 +- text/maps/celadon_dept_store_2f.asm | 6 +- text/maps/celadon_dept_store_3f.asm | 30 +- text/maps/celadon_dept_store_4f.asm | 15 +- text/maps/celadon_dept_store_5f.asm | 6 +- text/maps/celadon_dept_store_roof.asm | 46 ++- text/maps/celadon_diner.asm | 16 +- text/maps/celadon_game_corner.asm | 60 ++-- text/maps/celadon_gym.asm | 56 ++-- text/maps/celadon_hotel.asm | 6 +- text/maps/celadon_house.asm | 6 +- text/maps/celadon_mansion_1f.asm | 10 +- text/maps/celadon_mansion_2f.asm | 2 +- text/maps/celadon_mansion_3f.asm | 18 +- text/maps/celadon_mansion_4f_inside.asm | 2 +- text/maps/celadon_mansion_4f_outside.asm | 2 +- text/maps/celadon_pokecenter.asm | 4 +- text/maps/celadon_prize_room.asm | 4 +- text/maps/cerulean_badge_house.asm | 30 +- text/maps/cerulean_city.asm | 105 ++----- text/maps/cerulean_gym.asm | 56 +--- text/maps/cerulean_mart.asm | 4 +- text/maps/cerulean_pokecenter.asm | 4 +- text/maps/cerulean_trade_house.asm | 41 +-- text/maps/cerulean_trashed_house.asm | 8 +- text/maps/champion.asm | 16 +- text/maps/cinnabar_gym.asm | 60 ++-- text/maps/cinnabar_island.asm | 16 +- text/maps/cinnabar_lab.asm | 10 +- text/maps/cinnabar_lab_fossil_room.asm | 16 +- text/maps/cinnabar_lab_metronome_room.asm | 14 +- text/maps/cinnabar_lab_trade_room.asm | 2 +- text/maps/cinnabar_mart.asm | 4 +- text/maps/cinnabar_pokecenter.asm | 6 +- text/maps/copycats_house_1f.asm | 11 +- text/maps/copycats_house_2f.asm | 22 +- text/maps/daycare_1.asm | 16 +- text/maps/daycare_2.asm | 18 +- text/maps/digletts_cave_route_11_entrance.asm | 2 +- text/maps/digletts_cave_route_2_entrance.asm | 2 +- text/maps/fan_club.asm | 85 +----- text/maps/fighting_dojo.asm | 46 ++- text/maps/fuchsia_city.asm | 40 ++- text/maps/fuchsia_fishing_house.asm | 10 +- text/maps/fuchsia_gym_1.asm | 4 +- text/maps/fuchsia_gym_2.asm | 50 ++-- text/maps/fuchsia_house.asm | 6 +- text/maps/fuchsia_mart.asm | 4 +- text/maps/fuchsia_meeting_room.asm | 6 +- text/maps/fuchsia_pokecenter.asm | 4 +- text/maps/fujis_house.asm | 24 +- text/maps/hall_of_fame.asm | 6 +- text/maps/indigo_plateau_lobby.asm | 4 +- text/maps/lance.asm | 10 +- text/maps/lavender_house.asm | 6 +- text/maps/lavender_mart.asm | 6 +- text/maps/lavender_pokecenter.asm | 8 +- text/maps/lavender_town.asm | 18 +- text/maps/lorelei.asm | 8 +- text/maps/mansion_1f.asm | 12 +- text/maps/mansion_2f.asm | 16 +- text/maps/mansion_3f.asm | 14 +- text/maps/mansion_b1f.asm | 14 +- text/maps/mr_psychics_house.asm | 8 +- text/maps/mt_moon_1f.asm | 48 ++-- text/maps/mt_moon_b1f.asm | 2 +- text/maps/mt_moon_b2f.asm | 65 ++--- text/maps/mt_moon_pokecenter.asm | 14 +- text/maps/museum_1f.asm | 36 ++- text/maps/museum_2f.asm | 29 +- text/maps/name_rater.asm | 18 +- text/maps/oaks_lab.asm | 311 ++++----------------- text/maps/pewter_city.asm | 32 +-- text/maps/pewter_gym_1.asm | 2 +- text/maps/pewter_gym_2.asm | 68 +---- text/maps/pewter_house_1.asm | 6 +- text/maps/pewter_house_2.asm | 4 +- text/maps/pewter_mart.asm | 8 +- text/maps/pewter_pokecenter.asm | 19 +- text/maps/pokemon_league_gate.asm | 6 +- text/maps/pokemon_tower_1f.asm | 10 +- text/maps/pokemon_tower_2f.asm | 10 +- text/maps/pokemon_tower_3f.asm | 18 +- text/maps/pokemon_tower_4f.asm | 18 +- text/maps/pokemon_tower_5f.asm | 28 +- text/maps/pokemon_tower_6f.asm | 24 +- text/maps/pokemon_tower_7f.asm | 47 +--- text/maps/power_plant.asm | 4 +- text/maps/reds_house_1f.asm | 16 -- text/maps/rock_tunnel_b1f.asm | 44 +-- text/maps/rock_tunnel_b2f_1.asm | 40 +-- text/maps/rock_tunnel_b2f_2.asm | 8 +- text/maps/rock_tunnel_pokecenter.asm | 4 +- text/maps/rocket_hideout_b1f.asm | 30 +- text/maps/rocket_hideout_b2f.asm | 6 +- text/maps/rocket_hideout_b3f.asm | 12 +- text/maps/rocket_hideout_b4f.asm | 49 +--- text/maps/rocket_hideout_elevator.asm | 2 +- text/maps/route_1.asm | 12 +- text/maps/route_10.asm | 46 ++- text/maps/route_11_1.asm | 50 ++-- text/maps/route_11_2.asm | 12 +- text/maps/route_11_gate.asm | 2 +- text/maps/route_11_gate_upstairs.asm | 4 +- text/maps/route_12.asm | 56 ++-- text/maps/route_12_gate.asm | 2 +- text/maps/route_12_gate_upstairs.asm | 16 +- text/maps/route_12_house.asm | 12 +- text/maps/route_13.asm | 66 ++--- text/maps/route_14.asm | 66 ++--- text/maps/route_15.asm | 62 ++-- text/maps/route_15_gate.asm | 2 +- text/maps/route_15_gate_upstairs.asm | 4 +- text/maps/route_16.asm | 50 ++-- text/maps/route_16_gate.asm | 8 +- text/maps/route_16_gate_upstairs.asm | 8 +- text/maps/route_16_house.asm | 10 +- text/maps/route_17.asm | 76 +++-- text/maps/route_18.asm | 22 +- text/maps/route_18_gate.asm | 6 +- text/maps/route_18_gate_upstairs.asm | 4 +- text/maps/route_19.asm | 62 ++-- text/maps/route_2.asm | 4 +- text/maps/route_20.asm | 64 ++--- text/maps/route_21.asm | 54 ++-- text/maps/route_22.asm | 24 +- text/maps/route_23.asm | 8 +- text/maps/route_24_1.asm | 16 +- text/maps/route_24_2.asm | 34 +-- text/maps/route_25.asm | 91 ++---- text/maps/route_2_gate.asm | 4 +- text/maps/route_2_house.asm | 2 +- text/maps/route_3.asm | 57 ++-- text/maps/route_4.asm | 12 +- text/maps/route_5.asm | 2 +- text/maps/route_6.asm | 70 ++--- text/maps/route_7.asm | 2 +- text/maps/route_8.asm | 60 ++-- text/maps/route_9.asm | 73 ++--- text/maps/safari_zone_center.asm | 4 +- text/maps/safari_zone_east.asm | 6 +- text/maps/safari_zone_entrance.asm | 26 +- text/maps/safari_zone_north.asm | 10 +- text/maps/safari_zone_rest_house_1.asm | 4 +- text/maps/safari_zone_rest_house_2.asm | 6 +- text/maps/safari_zone_rest_house_3.asm | 6 +- text/maps/safari_zone_rest_house_4.asm | 6 +- text/maps/safari_zone_secret_house.asm | 8 +- text/maps/safari_zone_west.asm | 8 +- text/maps/saffron_city.asm | 46 +-- text/maps/saffron_gates.asm | 16 +- text/maps/saffron_gym.asm | 64 ++--- text/maps/saffron_house.asm | 8 +- text/maps/saffron_mart.asm | 4 +- text/maps/saffron_pokecenter.asm | 4 +- text/maps/school.asm | 12 +- text/maps/seafoam_islands_b4f.asm | 6 +- text/maps/silph_co_10f.asm | 42 +-- text/maps/silph_co_11f.asm | 38 +-- text/maps/silph_co_1f.asm | 2 +- text/maps/silph_co_2f.asm | 36 ++- text/maps/silph_co_3f.asm | 16 +- text/maps/silph_co_4f.asm | 22 +- text/maps/silph_co_5f_1.asm | 23 +- text/maps/silph_co_5f_2.asm | 16 +- text/maps/silph_co_6f.asm | 38 +-- text/maps/silph_co_7f.asm | 42 ++- text/maps/silph_co_8f.asm | 22 +- text/maps/silph_co_9f.asm | 24 +- text/maps/ss_anne_1.asm | 4 +- text/maps/ss_anne_10.asm | 40 +-- text/maps/ss_anne_2.asm | 10 +- text/maps/ss_anne_3.asm | 2 +- text/maps/ss_anne_5.asm | 18 +- text/maps/ss_anne_6.asm | 24 +- text/maps/ss_anne_7.asm | 22 +- text/maps/ss_anne_8.asm | 36 +-- text/maps/ss_anne_9.asm | 42 ++- text/maps/underground_path_route_6_entrance.asm | 2 +- text/maps/underground_path_route_7_entrance.asm | 2 +- .../underground_path_route_7_entrance_unused.asm | 8 +- text/maps/underground_path_route_8_entrance.asm | 2 +- text/maps/unknown_dungeon_b1f.asm | 2 +- text/maps/vermilion_city.asm | 34 +-- text/maps/vermilion_dock.asm | 2 +- text/maps/vermilion_fishing_house.asm | 12 +- text/maps/vermilion_gym_1.asm | 24 +- text/maps/vermilion_gym_2.asm | 38 ++- text/maps/vermilion_house.asm | 6 +- text/maps/vermilion_mart.asm | 4 +- text/maps/vermilion_pokecenter.asm | 6 +- text/maps/victory_road_1f.asm | 12 +- text/maps/victory_road_2f.asm | 32 +-- text/maps/victory_road_3f.asm | 24 +- text/maps/viridian_city.asm | 44 +-- text/maps/viridian_forest.asm | 74 ++--- text/maps/viridian_forest_entrance.asm | 15 +- text/maps/viridian_forest_exit.asm | 4 +- text/maps/viridian_gym.asm | 74 +++-- text/maps/viridian_house.asm | 8 +- text/maps/viridian_mart.asm | 28 +- text/maps/wardens_house.asm | 22 +- 208 files changed, 1923 insertions(+), 2888 deletions(-) diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index e78aeeab..158dbb63 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -1,4 +1,4 @@ -_AgathaBeforeBattleText:: ; 8686b (21:686b) +_AgathaBeforeBattleText:: text "I am AGATHA of" line "the ELITE FOUR!" @@ -22,17 +22,13 @@ _AgathaBeforeBattleText:: ; 8686b (21:686b) cont "trainer fights!" done -_AgathaEndBattleText:: ; 86970 (21:6970) -IF DEF(_YELLOW) - text "Woo-hoo!" -ELSE +_AgathaEndBattleText:: text "Oh ho!" -ENDC line "You're something" cont "special, child!" prompt -_AgathaAfterBattleText:: ; 86998 (21:6998) +_AgathaAfterBattleText:: text "You win! I see" line "what the old duff" cont "sees in you now!" @@ -42,7 +38,7 @@ _AgathaAfterBattleText:: ; 86998 (21:6998) cont "along now, child!" done -_AgathaDontRunAwayText:: ; 869fd (21:69fd) +_AgathaDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 45341c66..3247e0e3 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -1,4 +1,4 @@ -_BikeShopText_1d810:: ; 98e03 (26:4e03) +_BikeShopText_1d810:: text "Hi! Welcome to" line "our BIKE SHOP." @@ -6,17 +6,17 @@ _BikeShopText_1d810:: ; 98e03 (26:4e03) line "the BIKE for you!" prompt -_BikeShopText_1d815:: ; 98e45 (26:4e45) +_BikeShopText_1d815:: text "It's a cool BIKE!" line "Do you want it?" done -_BikeShopCantAffordText:: ; 98e67 (26:4e67) +_BikeShopCantAffordText:: text "Sorry! You can't" line "afford it!" prompt -_BikeShopText_1d81f:: ; 98e83 (26:4e83) +_BikeShopText_1d81f:: text "Oh, that's..." para "A BIKE VOUCHER!" @@ -24,17 +24,17 @@ _BikeShopText_1d81f:: ; 98e83 (26:4e83) para "OK! Here you go!" prompt -_BikeShopText_1d824:: ; 98eb2 (26:4eb2) +_BikeShopText_1d824:: text $52, " exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@@" -_BikeShopComeAgainText:: ; 98ee0 (26:4ee0) +_BikeShopComeAgainText:: text "Come back again" line "some time!" done -_BikeShopText_1d82f:: ; 98efc (26:4efc) +_BikeShopText_1d82f:: text "How do you like" line "your new BICYCLE?" @@ -43,12 +43,12 @@ _BikeShopText_1d82f:: ; 98efc (26:4efc) cont "and in caves!" done -_BikeShopText_1d834:: ; 98f4d (26:4f4d) +_BikeShopText_1d834:: text "You better make" line "room for this!" done -_BikeShopText_1d843:: ; 98f6d (26:4f6d) +_BikeShopText_1d843:: text "A plain city BIKE" line "is good enough" cont "for me!" @@ -58,13 +58,13 @@ _BikeShopText_1d843:: ; 98f6d (26:4f6d) cont "on an MTB!" done -_BikeShopText_1d85c:: ; 98fc1 (26:4fc1) +_BikeShopText_1d85c:: text "These BIKEs are" line "cool, but they're" cont "way expensive!" done -_BikeShopText_1d861:: ; 98ff2 (26:4ff2) +_BikeShopText_1d861:: text "Wow. Your BIKE is" line "really cool!" done diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 3ec1e3f3..83f92a64 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -1,11 +1,4 @@ -IF DEF(_YELLOW) -_BillsHouseDontLeaveText:: - text "Whoa, don't go" - line "anywhere, wait!" - done -ENDC - -_BillsHouseText_1e865:: ; 8d267 (23:5267) +_BillsHouseText_1e865:: text "Hiya! I'm a" line "#MON..." cont "...No I'm not!" @@ -26,7 +19,7 @@ _BillsHouseText_1e865:: ; 8d267 (23:5267) line "Help me out here!" done -_BillsHouseText_1e86a:: ; 8d345 (23:5345) +_BillsHouseText_1e86a:: text "When I'm in the" line "TELEPORTER, go to" cont "my PC and run the" @@ -34,7 +27,7 @@ _BillsHouseText_1e86a:: ; 8d345 (23:5345) cont "System!" done -_BillsHouseText_1e86f:: ; 8d391 (23:5391) +_BillsHouseText_1e86f:: text "No!? Come on, you" line "gotta help a guy" cont "in deep trouble!" @@ -44,7 +37,7 @@ _BillsHouseText_1e86f:: ; 8d391 (23:5391) cont "OK? All right!" prompt -_BillThankYouText:: ; 8d3f5 (23:53f5) +_BillThankYouText:: text "BILL: Yeehah!" line "Thanks, bud! I" cont "owe you one!" @@ -60,18 +53,18 @@ _BillThankYouText:: ; 8d3f5 (23:53f5) cont "maybe this'll do." prompt -_SSTicketReceivedText:: ; 8d499 (23:5499) +_SSTicketReceivedText:: text $52, " received" line "an @" TX_RAM wcf4b text "!@@" -_SSTicketNoRoomText:: ; 8d4b0 (23:54b0) +_SSTicketNoRoomText:: text "You've got too" line "much stuff, bud!" done -_BillsHouseText_1e8cb:: ; 8d4d0 (23:54d0) +_BillsHouseText_1e8cb:: text "That cruise ship," line "S.S.ANNE, is in" cont "VERMILION CITY." @@ -86,7 +79,7 @@ _BillsHouseText_1e8cb:: ; 8d4d0 (23:54d0) cont "instead of me?" done -_BillsHouseText_1e8da:: ; 8d57f (23:557f) +_BillsHouseText_1e8da:: text "BILL: Look, bud," line "just check out" cont "some of my rare" diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index a5b155f2..147b23fb 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -29,19 +29,11 @@ _DaisyUseMapText:: done _BluesHouseText2:: -IF DEF(_YELLOW) - text "Spending time" - line "with your #MON" - cont "makes them more" - cont "friendly to you." - done -ELSE text "#MON are living" line "things! If they" cont "get tired, give" cont "them a rest!" done -ENDC _BluesHouseText3:: text "It's a big map!" diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm index 70421db2..ddcbdb59 100644 --- a/text/maps/bruno.asm +++ b/text/maps/bruno.asm @@ -1,4 +1,4 @@ -_BrunoBeforeBattleText:: ; 86749 (21:6749) +_BrunoBeforeBattleText:: text "I am BRUNO of" line "the ELITE FOUR!" @@ -20,18 +20,18 @@ _BrunoBeforeBattleText:: ; 86749 (21:6749) para "Hoo hah!" done -_BrunoEndBattleText:: ; 86805 (21:6805) +_BrunoEndBattleText:: text "Why?" line "How could I lose?" prompt -_BrunoAfterBattleText:: ; 8681d (21:681d) +_BrunoAfterBattleText:: text "My job is done!" line "Go face your next" cont "challenge!" done -_BrunoDontRunAwayText:: ; 8684b (21:684b) +_BrunoDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index 6a02d125..ab78e9d6 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -1,33 +1,25 @@ -_CeladonCityText1:: ; a59fb (29:59fb) +_CeladonCityText1:: text "I got my KOFFING" -IF DEF(_YELLOW) - line "from my friend!" - - para "We get along now," - line "because I was" - cont "very nice to it!" -ELSE line "in CINNABAR!" para "It's nice, but it" line "breathes poison" cont "when it's angry!" -ENDC done -_CeladonCityText2:: ; a5a4b (29:5a4b) +_CeladonCityText2:: text "Heheh! This GYM" line "is great! It's" cont "full of women!" done -_CeladonCityText3:: ; a5a79 (29:5a79) +_CeladonCityText3:: text "The GAME CORNER" line "is bad for our" cont "city's image!" done -_CeladonCityText4:: ; a5aa6 (29:5aa6) +_CeladonCityText4:: text "Moan! I blew it" line "all at the slots!" @@ -36,7 +28,7 @@ _CeladonCityText4:: ; a5aa6 (29:5aa6) cont "coins for prizes!" done -_TM41PreText:: ; a5afd (29:5afd) +_TM41PreText:: text "Hello, there!" para "I've seen you," @@ -47,13 +39,13 @@ _TM41PreText:: ; a5afd (29:5afd) line "dropping by!" prompt -_ReceivedTM41Text:: ; a5b5a (29:5b5a) +_ReceivedTM41Text:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_TM41ExplanationText:: ; a5b6e (29:5b6e) +_TM41ExplanationText:: text "TM41 teaches" line "SOFTBOILED!" @@ -64,12 +56,12 @@ _TM41ExplanationText:: ; a5b6e (29:5b6e) line "CHANSEY!" done -_TM41NoRoomText:: ; a5bb8 (29:5bb8) +_TM41NoRoomText:: text "Oh, your pack is" line "full of items!" done -_CeladonCityText6:: ; a5bd9 (29:5bd9) +_CeladonCityText6:: text "This is my trusted" line "pal, POLIWRATH!" @@ -78,21 +70,21 @@ _CeladonCityText6:: ; a5bd9 (29:5bd9) cont "used WATER STONE!" done -_CeladonCityText7:: ; a5c30 (29:5c30) +_CeladonCityText7:: text "POLIWRATH: Ribi" line "ribit!@@" -_CeladonCityText8:: ; a5c49 (29:5c49) +_CeladonCityText8:: text "What are you" line "staring at?" done -_CeladonCityText9:: ; a5c63 (29:5c63) +_CeladonCityText9:: text "Keep out of TEAM" line "ROCKET's way!" done -_CeladonCityText10:: ; a5c82 (29:5c82) +_CeladonCityText10:: text "TRAINER TIPS" para "X ACCURACY boosts" @@ -108,36 +100,32 @@ _CeladonCityText10:: ; a5c82 (29:5c82) cont "STORE!" done -_CeladonCityText11:: ; a5d18 (29:5d18) +_CeladonCityText11:: text "CELADON CITY" line "The City of" cont "Rainbow Dreams" done -_CeladonCityText13:: ; a5d41 (29:5d41) +_CeladonCityText13:: text "CELADON CITY" line "#MON GYM" cont "LEADER: ERIKA" -IF DEF(_YELLOW) - para "The Nature-Loving" -ELSE para "The Nature Loving" -ENDC line "Princess!" done -_CeladonCityText14:: ; a5d82 (29:5d82) +_CeladonCityText14:: text "CELADON MANSION" done -_CeladonCityText15:: ; a5d93 (29:5d93) +_CeladonCityText15:: text "Find what you" line "need at CELADON" cont "DEPT. STORE!" done -_CeladonCityText16:: ; a5dbf (29:5dbf) +_CeladonCityText16:: text "TRAINER TIPS" para "GUARD SPEC." @@ -151,19 +139,15 @@ _CeladonCityText16:: ; a5dbf (29:5dbf) cont "STORE!" done -_CeladonCityText17:: ; a5e3e (29:5e3e) +_CeladonCityText17:: text "Coins exchanged" line "for prizes!" cont "PRIZE EXCHANGE" done -_CeladonCityText18:: ; a5e6a (29:5e6a) +_CeladonCityText18:: text "ROCKET GAME CORNER" line "The playground" -IF DEF(_YELLOW) - cont "for grownups!" -ELSE cont "for grown-ups!" -ENDC done diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/celadon_dept_store_1f.asm index 7751343b..cf343206 100644 --- a/text/maps/celadon_dept_store_1f.asm +++ b/text/maps/celadon_dept_store_1f.asm @@ -1,4 +1,4 @@ -_CeladonMart1Text1:: ; 9c672 (27:4672) +_CeladonMart1Text1:: text "Hello! Welcome to" line "CELADON DEPT." cont "STORE." @@ -8,7 +8,7 @@ _CeladonMart1Text1:: ; 9c672 (27:4672) cont "the store layout." done -_CeladonMart1Text2:: ; 9c6cd (27:46cd) +_CeladonMart1Text2:: text "1F: SERVICE" line " COUNTER" @@ -25,7 +25,7 @@ _CeladonMart1Text2:: ; 9c6cd (27:46cd) line "VENDING MACHINES" done -_CeladonMart1Text3:: ; 9c752 (27:4752) +_CeladonMart1Text3:: text "1F: SERVICE" line " COUNTER" done diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/celadon_dept_store_2f.asm index 88fe9ff8..b1345a05 100644 --- a/text/maps/celadon_dept_store_2f.asm +++ b/text/maps/celadon_dept_store_2f.asm @@ -1,4 +1,4 @@ -_CeladonMart2Text3:: ; 9c76b (27:476b) +_CeladonMart2Text3:: text "SUPER REPEL keeps" line "weak #MON at" cont "bay..." @@ -7,13 +7,13 @@ _CeladonMart2Text3:: ; 9c76b (27:476b) line "powerful REPEL!" done -_CeladonMart2Text4:: ; 9c7b2 (27:47b2) +_CeladonMart2Text4:: text "For long outings," line "you should buy" cont "REVIVE." done -_CeladonMart2Text5:: ; 9c7dc (27:47dc) +_CeladonMart2Text5:: text "Top Grade Items" line "for Trainers!" diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 289ed1d4..d98b4998 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -1,4 +1,4 @@ -_TM18PreReceiveText:: ; 9c814 (27:4814) +_TM18PreReceiveText:: text "Oh, hi! I finally" line "finished #MON!" @@ -7,25 +7,25 @@ _TM18PreReceiveText:: ; 9c814 (27:4814) cont "useful!" prompt -_ReceivedTM18Text:: ; 9c85a (27:485a) +_ReceivedTM18Text:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_TM18ExplanationText:: ; 9c86e (27:486e) +_TM18ExplanationText:: text "TM18 is COUNTER!" line "Not like the one" cont "I'm leaning on," cont "mind you!" done -_TM18NoRoomText:: ; 9c8aa (27:48aa) +_TM18NoRoomText:: text "Your pack is full" line "of items!" done -_CeladonMart3Text2:: ; 9c8c7 (27:48c7) +_CeladonMart3Text2:: text "Captured #MON" line "are registered" cont "with an ID No." @@ -35,7 +35,7 @@ _CeladonMart3Text2:: ; 9c8c7 (27:48c7) cont "caught it!" done -_CeladonMart3Text3:: ; 9c92d (27:492d) +_CeladonMart3Text3:: text "All right!" para "My buddy's going" @@ -44,7 +44,7 @@ _CeladonMart3Text3:: ; 9c92d (27:492d) cont "GRAVELER!" done -_CeladonMart3Text4:: ; 9c975 (27:4975) +_CeladonMart3Text4:: text "Come on GRAVELER!" para "I love GRAVELER!" @@ -57,42 +57,42 @@ _CeladonMart3Text4:: ; 9c975 (27:4975) cont "#MON!" done -_CeladonMart3Text5:: ; 9c9d5 (27:49d5) +_CeladonMart3Text5:: text "You can identify" line "#MON you got" cont "in trades by" cont "their ID Numbers!" done -_CeladonMart3Text6:: ; 9ca13 (27:4a13) +_CeladonMart3Text6:: text "It's an SNES!" done -_CeladonMart3Text7:: ; 9ca21 (27:4a21) +_CeladonMart3Text7:: text "An RPG! There's" line "no time for that!" done -_CeladonMart3Text9:: ; 9ca43 (27:4a43) +_CeladonMart3Text9:: text "A sports game!" line "Dad'll like that!" done -_CeladonMart3Text11:: ; 9ca64 (27:4a64) +_CeladonMart3Text11:: text "A puzzle game!" line "Looks addictive!" done -_CeladonMart3Text13:: ; 9ca85 (27:4a85) +_CeladonMart3Text13:: text "A fighting game!" line "Looks tough!" done -_CeladonMart3Text14:: ; 9caa4 (27:4aa4) +_CeladonMart3Text14:: text "3F: TV GAME SHOP" done -_CeladonMart3Text15:: ; 9cab6 (27:4ab6) +_CeladonMart3Text15:: text "Red and Blue!" line "Both are #MON!" done diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm index de33021b..2fca6106 100644 --- a/text/maps/celadon_dept_store_4f.asm +++ b/text/maps/celadon_dept_store_4f.asm @@ -1,19 +1,10 @@ -_CeladonMart4Text2:: ; 9cad4 (27:4ad4) +_CeladonMart4Text2:: text "I'm getting a" -IF DEF(_YELLOW) - line "gift for COPYCAT" - cont "in CERULEAN CITY." - - para "It's got to be a" - line "# DOLL. They" - cont "are trendy!" -ELSE line "# DOLL for my" cont "girl friend!" -ENDC done -_CeladonMart4Text3:: ; 9cafd (27:4afd) +_CeladonMart4Text3:: text "I heard something" line "useful." @@ -23,7 +14,7 @@ _CeladonMart4Text3:: ; 9cafd (27:4afd) cont "with a # DOLL!" done -_CeladonMart4Text4:: ; 9cb56 (27:4b56) +_CeladonMart4Text4:: text "Express yourself" line "with gifts!" diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/celadon_dept_store_5f.asm index 630a56a5..a2bb97f6 100644 --- a/text/maps/celadon_dept_store_5f.asm +++ b/text/maps/celadon_dept_store_5f.asm @@ -1,4 +1,4 @@ -_CeladonMart5Text1:: ; 9ddff (27:5dff) +_CeladonMart5Text1:: text "#MON ability" line "enhancers can be" cont "bought only here." @@ -11,7 +11,7 @@ _CeladonMart5Text1:: ; 9ddff (27:5dff) line "increase SPEED." done -_CeladonMart5Text2:: ; 9de79 (27:5e79) +_CeladonMart5Text2:: text "I'm here for" line "#MON ability" cont "enhancers." @@ -23,7 +23,7 @@ _CeladonMart5Text2:: ; 9de79 (27:5e79) line "DEFENSE!" done -_CeladonMart5Text5:: ; 9ded6 (27:5ed6) +_CeladonMart5Text5:: text "5F: DRUG STORE" done diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index f2eef613..5099509f 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -1,9 +1,9 @@ -_CeladonMartRoofText_484ee:: ; 9cbb5 (27:4bb5) +_CeladonMartRoofText_484ee:: text "Give her which" line "drink?" done -_CeladonMartRoofText_484f3:: ; 9cbcc (27:4bcc) +_CeladonMartRoofText_484f3:: text "Yay!" para "FRESH WATER!" @@ -13,13 +13,13 @@ _CeladonMartRoofText_484f3:: ; 9cbcc (27:4bcc) para "You can have this" line "from me!@@" -_CeladonMartRoofText_484f9:: ; 9cc06 (27:4c06) +_CeladonMartRoofText_484f9:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_CeladonMartRoofText_484fe:: ; 9cc1a (27:4c1a) +_CeladonMartRoofText_484fe:: db $0 para "@" TX_RAM wcf4b @@ -29,7 +29,7 @@ _CeladonMartRoofText_484fe:: ; 9cc1a (27:4c1a) para "It can freeze the" line "target sometimes!@@" -_CeladonMartRoofText_48504:: ; 9cc5a (27:4c5a) +_CeladonMartRoofText_48504:: text "Yay!" para "SODA POP!" @@ -39,27 +39,23 @@ _CeladonMartRoofText_48504:: ; 9cc5a (27:4c5a) para "You can have this" line "from me!@@" -_CeladonMartRoofText_4850a:: ; 9cc91 (27:4c91) +_CeladonMartRoofText_4850a:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_CeladonMartRoofText_4850f:: ; 9cca5 (27:4ca5) +_CeladonMartRoofText_4850f:: db $0 para "@" TX_RAM wcf4b text " contains" -IF DEF(_YELLOW) - line "ROCK SLIDE!@@" -ELSE line "ROCK SLIDE!" para "It can spook the" line "target sometimes!@@" -ENDC -_CeladonMartRoofText_48515:: ; 9cce6 (27:4ce6) +_CeladonMartRoofText_48515:: text "Yay!" para "LEMONADE!" @@ -69,25 +65,25 @@ _CeladonMartRoofText_48515:: ; 9cce6 (27:4ce6) para "You can have this" line "from me!@@" -_ReceivedTM49Text:: ; 9cd1d (27:4d1d) +_ReceivedTM49Text:: text $52, " received" line "TM49!@@" -_CeladonMartRoofText_48520:: ; 9cd30 (27:4d30) +_CeladonMartRoofText_48520:: db $0 para "TM49 contains" line "TRI ATTACK!@@" -_CeladonMartRoofText_48526:: ; 9cd4d (27:4d4d) +_CeladonMartRoofText_48526:: text "You don't have" line "space for this!@@" -_CeladonMartRoofText_4852c:: ; 9cd6d (27:4d6d) +_CeladonMartRoofText_4852c:: text "No thank you!" line "I'm not thirsty" cont "after all!@@" -_CeladonMartRoofText1:: ; 9cd97 (27:4d97) +_CeladonMartRoofText1:: text "My sister is a" line "trainer, believe" cont "it or not." @@ -97,13 +93,13 @@ _CeladonMartRoofText1:: ; 9cd97 (27:4d97) cont "drives me nuts!" done -_CeladonMartRoofText_48598:: ; 9cdee (27:4dee) +_CeladonMartRoofText_48598:: text "I'm thirsty!" line "I want something" cont "to drink!" done -_CeladonMartRoofText4:: ; 9ce16 (27:4e16) +_CeladonMartRoofText4:: text "I'm thirsty!" line "I want something" cont "to drink!" @@ -111,33 +107,33 @@ _CeladonMartRoofText4:: ; 9ce16 (27:4e16) para "Give her a drink?" done -_CeladonMartRoofText6:: ; 9ce50 (27:4e50) +_CeladonMartRoofText6:: text "ROOFTOP SQUARE:" line "VENDING MACHINES" done -_VendingMachineText1:: ; 9ce72 (27:4e72) +_VendingMachineText1:: text "A vending machine!" line "Here's the menu!" prompt -_VendingMachineText4:: ; 9ce96 (27:4e96) +_VendingMachineText4:: text "Oops, not enough" line "money!" done -_VendingMachineText5:: ; 9ceaf (27:4eaf) +_VendingMachineText5:: TX_RAM wcf4b db $0 line "popped out!" done -_VendingMachineText6:: ; 9cec0 (27:4ec0) +_VendingMachineText6:: text "There's no more" line "room for stuff!" done -_VendingMachineText7:: ; 9cee0 (27:4ee0) +_VendingMachineText7:: text "Not thirsty!" done diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm index 2b4cc321..7f69e67f 100644 --- a/text/maps/celadon_diner.asm +++ b/text/maps/celadon_diner.asm @@ -1,24 +1,24 @@ -_CeladonDinerText1:: ; 9df3f (27:5f3f) +_CeladonDinerText1:: text "Hi!" para "We're taking a" line "break now." done -_CeladonDinerText2:: ; 9df5d (27:5f5d) +_CeladonDinerText2:: text "My #MON are" line "weak, so I often" cont "have to go to the" cont "DRUG STORE." done -_CeladonDinerText3:: ; 9df99 (27:5f99) +_CeladonDinerText3:: text "Psst! There's a" line "basement under" cont "the GAME CORNER." done -_CeladonDinerText4:: ; 9dfc9 (27:5fc9) +_CeladonDinerText4:: text "Munch..." para "The man at that" @@ -26,7 +26,7 @@ _CeladonDinerText4:: ; 9dfc9 (27:5fc9) cont "at the slots." done -_CeladonDinerText_491a7:: ; 9e003 (27:6003) +_CeladonDinerText_491a7:: text "Go ahead! Laugh!" para "I'm flat out" @@ -41,18 +41,18 @@ _CeladonDinerText_491a7:: ; 9e003 (27:6003) cont "more!" prompt -_ReceivedCoinCaseText:: ; 9e07a (27:607a) +_ReceivedCoinCaseText:: text $52, " received" line "a @" TX_RAM wcf4b text "!@@" -_CoinCaseNoRoomText:: ; 9e090 (27:6090) +_CoinCaseNoRoomText:: text "Make room for" line "this!" done -_CeladonDinerText_491b7:: ; 9e0a5 (27:60a5) +_CeladonDinerText_491b7:: text "I always thought" line "I was going to" cont "win it back..." diff --git a/text/maps/celadon_game_corner.asm b/text/maps/celadon_game_corner.asm index c08a81b1..b74b04b3 100644 --- a/text/maps/celadon_game_corner.asm +++ b/text/maps/celadon_game_corner.asm @@ -1,4 +1,4 @@ -_CeladonGameCornerText1:: ; 9d8d5 (27:58d5) +_CeladonGameCornerText1:: text "Welcome!" para "You can exchange" @@ -7,7 +7,7 @@ _CeladonGameCornerText1:: ; 9d8d5 (27:58d5) cont "next door." done -_CeladonGameCornerText_48d22:: ; 9d91a (27:591a) +_CeladonGameCornerText_48d22:: text "Welcome to ROCKET" line "GAME CORNER!" @@ -19,32 +19,32 @@ _CeladonGameCornerText_48d22:: ; 9d91a (27:591a) cont "like some?" done -_CeladonGameCornerText_48d27:: ; 9d984 (27:5984) +_CeladonGameCornerText_48d27:: text "Thanks! Here are" line "your 50 coins!" done -_CeladonGameCornerText_48d2c:: ; 9d9a5 (27:59a5) +_CeladonGameCornerText_48d2c:: text "No? Please come" line "play sometime!" done -_CeladonGameCornerText_48d31:: ; 9d9c5 (27:59c5) +_CeladonGameCornerText_48d31:: text "You can't afford" line "the coins!" done -_CeladonGameCornerText_48d36:: ; 9d9e1 (27:59e1) +_CeladonGameCornerText_48d36:: text "Oops! Your COIN" line "CASE is full." done -_CeladonGameCornerText_48d3b:: ; 9da00 (27:5a00) +_CeladonGameCornerText_48d3b:: text "You don't have a" line "COIN CASE!" done -_CeladonGameCornerText3:: ; 9da1c (27:5a1c) +_CeladonGameCornerText3:: text "Keep this quiet." para "It's rumored that" @@ -52,37 +52,37 @@ _CeladonGameCornerText3:: ; 9da1c (27:5a1c) cont "by TEAM ROCKET." done -_CeladonGameCornerText4:: ; 9da61 (27:5a61) +_CeladonGameCornerText4:: text "I think these" line "machines have" cont "different odds." done -_CeladonGameCornerText_48d9c:: ; 9da8e (27:5a8e) +_CeladonGameCornerText_48d9c:: text "Kid, do you want" line "to play?" prompt -_Received10CoinsText:: ; 9daa9 (27:5aa9) +_Received10CoinsText:: text $52, " received" line "10 coins!@@" -_CeladonGameCornerText_48da7:: ; 9dac0 (27:5ac0) +_CeladonGameCornerText_48da7:: text "You don't need my" line "coins!" done -_CeladonGameCornerText_48dac:: ; 9dad9 (27:5ad9) +_CeladonGameCornerText_48dac:: text "Wins seem to come" line "and go." done -_CeladonGameCornerText6:: ; 9daf4 (27:5af4) +_CeladonGameCornerText6:: text "I'm having a" line "wonderful time!" done -_CeladonGameCornerText_48dca:: ; 9db11 (27:5b11) +_CeladonGameCornerText_48dca:: text "Hey!" para "You have better" @@ -99,7 +99,7 @@ _CeladonGameCornerText_48dca:: ; 9db11 (27:5b11) cont "be fooled!" done -_CeladonGameCornerText_48dcf:: ; 9dbac (27:5bac) +_CeladonGameCornerText_48dcf:: text "They offer rare" line "#MON that can" cont "be exchanged for" @@ -109,78 +109,78 @@ _CeladonGameCornerText_48dcf:: ; 9dbac (27:5bac) line "seem to win!" done -_CeladonGameCornerText8:: ; 9dc06 (27:5c06) +_CeladonGameCornerText8:: text "Games are scary!" line "It's so easy to" cont "get hooked!" done -_CeladonGameCornerText_48e26:: ; 9dc33 (27:5c33) +_CeladonGameCornerText_48e26:: text "What's up? Want" line "some coins?" prompt -_Received20CoinsText:: ; 9dc4f (27:5c4f) +_Received20CoinsText:: text $52, " received" line "20 coins!@@" -_CeladonGameCornerText_48e31:: ; 9dc66 (27:5c66) +_CeladonGameCornerText_48e31:: text "You have lots of" line "coins!" done -_CeladonGameCornerText_48e36:: ; 9dc7f (27:5c7f) +_CeladonGameCornerText_48e36:: text "Darn! I need more" line "coins for the" cont "#MON I want!" done -_CeladonGameCornerText_48e88:: ; 9dcad (27:5cad) +_CeladonGameCornerText_48e88:: text "Hey, what? You're" line "throwing me off!" cont "Here are some" cont "coins, shoo!" prompt -_CeladonGameCornerText_48e8d:: ; 9dceb (27:5ceb) +_CeladonGameCornerText_48e8d:: text $52, " received" line "20 coins!@@" -_CeladonGameCornerText_48e93:: ; 9dd02 (27:5d02) +_CeladonGameCornerText_48e93:: text "You've got your" line "own coins!" done -_CeladonGameCornerText_48e98:: ; 9dd1d (27:5d1d) +_CeladonGameCornerText_48e98:: text "The trick is to" line "watch the reels" cont "closely!" done -_CeladonGameCornerText_48ece:: ; 9dd47 (27:5d47) +_CeladonGameCornerText_48ece:: text "I'm guarding this" line "poster!" cont "Go away, or else!" done -_CeladonGameCornerText_48ed3:: ; 9dd73 (27:5d73) +_CeladonGameCornerText_48ed3:: text "Dang!" prompt -_CeladonGameCornerText_48ed8:: ; 9dd7a (27:5d7a) +_CeladonGameCornerText_48ed8:: text "Our hideout might" line "be discovered! I" cont "better tell BOSS!" done -_CeladonGameCornerText_48f09:: ; 9ddb0 (27:5db0) +_CeladonGameCornerText_48f09:: text "Hey!" para "A switch behind" line "the poster!?" cont "Let's push it!@@" -_CeladonGameCornerText_48f19:: ; 9dde2 (27:5de2) +_CeladonGameCornerText_48f19:: text "Oops! Forgot the" line "COIN CASE!" done diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm index 66452a2c..c076196f 100644 --- a/text/maps/celadon_gym.asm +++ b/text/maps/celadon_gym.asm @@ -1,4 +1,4 @@ -_CeladonGymText_48a5e:: ; 9d28f (27:528f) +_CeladonGymText_48a5e:: text "Hello. Lovely" line "weather isn't it?" cont "It's so pleasant." @@ -25,7 +25,7 @@ _CeladonGymText_48a5e:: ; 9d28f (27:528f) line "shall not lose." done -_CeladonGymText_48a63:: ; 9d3c2 (27:53c2) +_CeladonGymText_48a63:: text "Oh!" line "I concede defeat." @@ -36,7 +36,7 @@ _CeladonGymText_48a63:: ; 9d3c2 (27:53c2) line "the RAINBOWBADGE." prompt -_CeladonGymText_48a68:: ; 9d418 (27:5418) +_CeladonGymText_48a68:: text "You are cataloging" line "#MON? I must" cont "say I'm impressed." @@ -47,7 +47,7 @@ _CeladonGymText_48a68:: ; 9d418 (27:5418) cont "unattractive." done -_CeladonGymText9:: ; 9d481 (27:5481) +_CeladonGymText9:: text "The RAINBOWBADGE" line "will make #MON" cont "up to L50 obey." @@ -61,13 +61,13 @@ _CeladonGymText9:: ; 9d481 (27:5481) line "this with you." done -_ReceivedTM21Text:: ; 9d50c (27:550c) +_ReceivedTM21Text:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_TM21ExplanationText:: ; 9d520 (27:5520) +_TM21ExplanationText:: db $0 para "TM21 contains" line "MEGA DRAIN." @@ -78,40 +78,40 @@ _TM21ExplanationText:: ; 9d520 (27:5520) cont "your #MON!" done -_TM21NoRoomText:: ; 9d576 (27:5576) +_TM21NoRoomText:: text "You should make" line "room for this." done -_CeladonGymBattleText2:: ; 9d596 (27:5596) +_CeladonGymBattleText2:: text "Hey!" para "You are not" line "allowed in here!" done -_CeladonGymEndBattleText2:: ; 9d5b9 (27:55b9) +_CeladonGymEndBattleText2:: text "You're" line "too rough!" prompt -_CeladonGymAfterBattleText2:: ; 9d5cb (27:55cb) +_CeladonGymAfterBattleText2:: text "Bleaah!" line "I hope ERIKA" cont "wipes you out!" done -_CeladonGymBattleText3:: ; 9d5f0 (27:55f0) +_CeladonGymBattleText3:: text "I was getting" line "bored." done -_CeladonGymEndBattleText3:: ; 9d606 (27:5606) +_CeladonGymEndBattleText3:: text "My" line "makeup!" prompt -_CeladonGymAfterBattleText3:: ; 9d612 (27:5612) +_CeladonGymAfterBattleText3:: text "Grass-type #MON" line "are tough against" cont "the water-type!" @@ -121,23 +121,23 @@ _CeladonGymAfterBattleText3:: ; 9d612 (27:5612) cont "ground #MON!" done -_CeladonGymBattleText4:: ; 9d675 (27:5675) +_CeladonGymBattleText4:: text "Aren't you the" line "peeping Tom?" done -_CeladonGymEndBattleText4:: ; 9d691 (27:5691) +_CeladonGymEndBattleText4:: text "I'm" line "in shock!" prompt -_CeladonGymAfterBattleText4:: ; 9d69f (27:569f) +_CeladonGymAfterBattleText4:: text "Oh, you weren't" line "peeping? We get a" cont "lot of gawkers!" done -_CeladonGymBattleText5:: ; 9d6d1 (27:56d1) +_CeladonGymBattleText5:: text "Look at my grass" line "#MON!" @@ -145,11 +145,11 @@ _CeladonGymBattleText5:: ; 9d6d1 (27:56d1) line "to raise!" done -_CeladonGymEndBattleText5:: ; 9d702 (27:5702) +_CeladonGymEndBattleText5:: text "No!" prompt -_CeladonGymAfterBattleText5:: ; 9d707 (27:5707) +_CeladonGymAfterBattleText5:: text "We only use grass-" line "type #MON at" cont "our GYM!" @@ -159,43 +159,43 @@ _CeladonGymAfterBattleText5:: ; 9d707 (27:5707) cont "arrangements!" done -_CeladonGymBattleText6:: ; 9d762 (27:5762) +_CeladonGymBattleText6:: text "Don't bring any" line "bugs or fire" cont "#MON in here!" done -_CeladonGymEndBattleText6:: ; 9d78d (27:578d) +_CeladonGymEndBattleText6:: text "Oh!" line "You!" prompt -_CeladonGymAfterBattleText6:: ; 9d797 (27:5797) +_CeladonGymAfterBattleText6:: text "Our LEADER, ERIKA," line "might be quiet," cont "but she's also" cont "very skilled!" done -_CeladonGymBattleText7:: ; 9d7d7 (27:57d7) +_CeladonGymBattleText7:: text "Pleased to meet" line "you. My hobby is" cont "#MON training." done -_CeladonGymEndBattleText7:: ; 9d808 (27:5808) +_CeladonGymEndBattleText7:: text "Oh!" line "Splendid!" prompt -_CeladonGymAfterBattleText7:: ; 9d817 (27:5817) +_CeladonGymAfterBattleText7:: text "I have a blind" line "date coming up." cont "I have to learn" cont "to be polite." done -_CeladonGymBattleText8:: ; 9d855 (27:5855) +_CeladonGymBattleText8:: text "Welcome to" line "CELADON GYM!" @@ -204,12 +204,12 @@ _CeladonGymBattleText8:: ; 9d855 (27:5855) cont "girl power!" done -_CeladonGymEndBattleText8:: ; 9d897 (27:5897) +_CeladonGymEndBattleText8:: text "Oh!" line "Beaten!" prompt -_CeladonGymAfterBattleText8:: ; 9d8a4 (27:58a4) +_CeladonGymAfterBattleText8:: text "I didn't bring my" line "best #MON!" diff --git a/text/maps/celadon_hotel.asm b/text/maps/celadon_hotel.asm index a7b6ade3..c9e8bd8b 100644 --- a/text/maps/celadon_hotel.asm +++ b/text/maps/celadon_hotel.asm @@ -1,4 +1,4 @@ -_CeladonHotelText1:: ; 9e18a (27:618a) +_CeladonHotelText1:: text "#MON? No, this" line "is a hotel for" cont "people." @@ -6,7 +6,7 @@ _CeladonHotelText1:: ; 9e18a (27:618a) para "We're full up." done -_CeladonHotelText2:: ; 9e1bf (27:61bf) +_CeladonHotelText2:: text "I'm on vacation" line "with my brother" cont "and boy friend." @@ -15,7 +15,7 @@ _CeladonHotelText2:: ; 9e1bf (27:61bf) line "pretty city!" done -_CeladonHotelText3:: ; 9e20e (27:620e) +_CeladonHotelText3:: text "Why did she bring" line "her brother?" done diff --git a/text/maps/celadon_house.asm b/text/maps/celadon_house.asm index 1a650a98..c0bb9532 100644 --- a/text/maps/celadon_house.asm +++ b/text/maps/celadon_house.asm @@ -1,10 +1,10 @@ -_CeladonHouseText1:: ; 9e0d5 (27:60d5) +_CeladonHouseText1:: text "Hehehe! The slots" line "just reel in the" cont "dough, big time!" done -_CeladonHouseText2:: ; 9e10a (27:610a) +_CeladonHouseText2:: text "CHIEF!" para "We just shipped" @@ -12,7 +12,7 @@ _CeladonHouseText2:: ; 9e10a (27:610a) cont "slot prizes!" done -_CeladonHouseText3:: ; 9e13c (27:613c) +_CeladonHouseText3:: text "Don't touch the" line "poster at the" cont "GAME CORNER!" diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/celadon_mansion_1f.asm index 7ea36a1a..953c9c4a 100644 --- a/text/maps/celadon_mansion_1f.asm +++ b/text/maps/celadon_mansion_1f.asm @@ -1,7 +1,7 @@ -_CeladonMansion1Text1:: ; 9ceee (27:4eee) +_CeladonMansion1Text1:: text "MEOWTH: Meow!@@" -_CeladonMansion1Text2:: ; 9cefe (27:4efe) +_CeladonMansion1Text2:: text "My dear #MON" line "keep me company." @@ -9,15 +9,15 @@ _CeladonMansion1Text2:: ; 9cefe (27:4efe) line "money home!" done -_CeladonMansion1Text3:: ; 9cf3c (27:4f3c) +_CeladonMansion1Text3:: text "CLEFAIRY: Pi" line "pippippi!@@" -_CeladonMansion1Text4:: ; 9cf55 (27:4f55) +_CeladonMansion1Text4:: text "NIDORAN: Kya" line "kyaoo!@@" -_CeladonMansion1Text5:: ; 9cf6b (27:4f6b) +_CeladonMansion1Text5:: text "CELADON MANSION" line "Manager's Suite" done diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/celadon_mansion_2f.asm index 01841716..ecb46da6 100644 --- a/text/maps/celadon_mansion_2f.asm +++ b/text/maps/celadon_mansion_2f.asm @@ -1,4 +1,4 @@ -_CeladonMansion2Text1:: ; 9cf8b (27:4f8b) +_CeladonMansion2Text1:: text "GAME FREAK" line "Meeting Room" done diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/celadon_mansion_3f.asm index 06220b23..f761da72 100644 --- a/text/maps/celadon_mansion_3f.asm +++ b/text/maps/celadon_mansion_3f.asm @@ -1,15 +1,15 @@ -_ProgrammerText:: ; 9cfa4 (27:4fa4) +_ProgrammerText:: text "Me? I'm the" line "programmer!" done -_GraphicArtistText:: ; 9cfbc (27:4fbc) +_GraphicArtistText:: text "I'm the graphic" line "artist!" cont "I drew you!" done -_WriterText:: ; 9cfe0 (27:4fe0) +_WriterText:: text "I wrote the story!" line "Isn't ERIKA cute?" @@ -20,7 +20,7 @@ _WriterText:: ; 9cfe0 (27:4fe0) line "I like her!" done -_GameDesignerText:: ; 9d03a (27:503a) +_GameDesignerText:: text "Is that right?" para "I'm the game" @@ -34,33 +34,33 @@ _GameDesignerText:: ; 9d03a (27:503a) line "come tell me!" done -_CompletedDexText:: ; 9d0ad (27:50ad) +_CompletedDexText:: text "Wow! Excellent!" line "You completed" cont "your #DEX!" cont "Congratulations!" cont "...@@" -_CeladonMansion3Text5:: ; 9d0ed (27:50ed) +_CeladonMansion3Text5:: text "It's the game" line "program! Messing" cont "with it could bug" cont "out the game!" done -_CeladonMansion3Text6:: ; 9d12c (27:512c) +_CeladonMansion3Text6:: text "Someone's playing" line "a game instead of" cont "working!" done -_CeladonMansion3Text7:: ; 9d159 (27:5159) +_CeladonMansion3Text7:: text "It's the script!" line "Better not look" cont "at the ending!" done -_CeladonMansion3Text8:: ; 9d189 (27:5189) +_CeladonMansion3Text8:: text "GAME FREAK" line "Development Room" done diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/celadon_mansion_4f_inside.asm index 7268d7be..9749774f 100644 --- a/text/maps/celadon_mansion_4f_inside.asm +++ b/text/maps/celadon_mansion_4f_inside.asm @@ -1,4 +1,4 @@ -_CeladonMansion5Text1:: ; 9d1ba (27:51ba) +_CeladonMansion5Text1:: text "I know everything" line "about the world" cont "of #MON in" diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/celadon_mansion_4f_outside.asm index aab4a76f..7053d74a 100644 --- a/text/maps/celadon_mansion_4f_outside.asm +++ b/text/maps/celadon_mansion_4f_outside.asm @@ -1,4 +1,4 @@ -_CeladonMansion4Text1:: ; 9d1a6 (27:51a6) +_CeladonMansion4Text1:: text "I KNOW EVERYTHING!" done diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/celadon_pokecenter.asm index 66feea37..32fa7a6a 100644 --- a/text/maps/celadon_pokecenter.asm +++ b/text/maps/celadon_pokecenter.asm @@ -1,11 +1,11 @@ -_CeladonPokecenterText2:: ; 9d226 (27:5226) +_CeladonPokecenterText2:: text "# FLUTE awakens" line "#MON with a" cont "sound that only" cont "they can hear!" done -_CeladonPokecenterText3:: ; 9d262 (27:5262) +_CeladonPokecenterText3:: text "I rode uphill on" line "CYCLING ROAD from" cont "FUCHSIA!" diff --git a/text/maps/celadon_prize_room.asm b/text/maps/celadon_prize_room.asm index 7bf1f821..3f96fdfb 100644 --- a/text/maps/celadon_prize_room.asm +++ b/text/maps/celadon_prize_room.asm @@ -1,4 +1,4 @@ -_CeladonPrizeRoomText1:: ; 9dee6 (27:5ee6) +_CeladonPrizeRoomText1:: text "I sure do fancy" line "that PORYGON!" @@ -6,7 +6,7 @@ _CeladonPrizeRoomText1:: ; 9dee6 (27:5ee6) line "win at slots!" done -_CeladonPrizeRoomText2:: ; 9df24 (27:5f24) +_CeladonPrizeRoomText2:: text "I had a major" line "haul today!" done diff --git a/text/maps/cerulean_badge_house.asm b/text/maps/cerulean_badge_house.asm index d546066a..12c0e5ae 100644 --- a/text/maps/cerulean_badge_house.asm +++ b/text/maps/cerulean_badge_house.asm @@ -1,4 +1,4 @@ -_CeruleanHouse2Text_74e77:: ; 990c9 (26:50c9) +_CeruleanHouse2Text_74e77:: text "#MON BADGEs" line "are owned only by" cont "skilled trainers." @@ -10,7 +10,7 @@ _CeruleanHouse2Text_74e77:: ; 990c9 (26:50c9) line "amazing secrets!" prompt -_CeruleanHouse2Text_74e7c:: ; 9913a (26:513a) +_CeruleanHouse2Text_74e7c:: text "Now then..." para "Which of the 8" @@ -18,30 +18,22 @@ _CeruleanHouse2Text_74e7c:: ; 9913a (26:513a) cont "describe?" done -_CeruleanHouse2Text_74e81:: ; 99170 (26:5170) -IF DEF(_YELLOW) - text "Come visit me any-" -ELSE +_CeruleanHouse2Text_74e81:: text "Come visit me any" -ENDC line "time you wish." done -_CeruleanHouse2Text_74e96:: ; 99192 (26:5192) +_CeruleanHouse2Text_74e96:: text "The ATTACK of all" line "#MON increases" cont "a little bit." para "It also lets you" -IF DEF(_YELLOW) - line "use FLASH any-" -ELSE line "use FLASH any" -ENDC cont "time you desire." prompt -_CeruleanHouse2Text_74e9b:: ; 991f2 (26:51f2) +_CeruleanHouse2Text_74e9b:: text "#MON up to L30" line "will obey you." @@ -53,7 +45,7 @@ _CeruleanHouse2Text_74e9b:: ; 991f2 (26:51f2) cont "of battle." prompt -_CeruleanHouse2Text_74ea0:: ; 9925d (26:525d) +_CeruleanHouse2Text_74ea0:: text "The SPEED of all" line "#MON increases" cont "a little bit." @@ -63,7 +55,7 @@ _CeruleanHouse2Text_74ea0:: ; 9925d (26:525d) cont "of battle." prompt -_CeruleanHouse2Text_74ea5:: ; 992b8 (26:52b8) +_CeruleanHouse2Text_74ea5:: text "#MON up to L50" line "will obey you." @@ -75,7 +67,7 @@ _CeruleanHouse2Text_74ea5:: ; 992b8 (26:52b8) cont "side of battle." prompt -_CeruleanHouse2Text_74eaa:: ; 9932a (26:532a) +_CeruleanHouse2Text_74eaa:: text "The DEFENSE of all" line "#MON increases" cont "a little bit." @@ -85,7 +77,7 @@ _CeruleanHouse2Text_74eaa:: ; 9932a (26:532a) cont "of battle." prompt -_CeruleanHouse2Text_74eaf:: ; 99388 (26:5388) +_CeruleanHouse2Text_74eaf:: text "#MON up to L70" line "will obey you." @@ -93,13 +85,13 @@ _CeruleanHouse2Text_74eaf:: ; 99388 (26:5388) line "become unruly!" prompt -_CeruleanHouse2Text_74eb4:: ; 993c7 (26:53c7) +_CeruleanHouse2Text_74eb4:: text "Your #MON's" line "SPECIAL abilities" cont "increase a bit." prompt -_CeruleanHouse2Text_74eb9:: ; 993f5 (26:53f5) +_CeruleanHouse2Text_74eb9:: text "All #MON will" line "obey you!" prompt diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm index f014ee5d..465f1155 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/cerulean_city.asm @@ -1,4 +1,4 @@ -_CeruleanCityText_19668:: ; a4d2b (29:4d2b) +_CeruleanCityText_19668:: text $53, ": Yo!" line $52, "!" @@ -16,19 +16,19 @@ _CeruleanCityText_19668:: ; a4d2b (29:4d2b) cont $52, "!" done -_CeruleanCityText_1966d:: ; a4dbe (29:4dbe) +_CeruleanCityText_1966d:: text "Hey!" line "Take it easy!" cont "You won already!" prompt -_CeruleanCityText_19672:: ; a4de3 (29:4de3) +_CeruleanCityText_19672:: text "Heh!" line "You're no match" cont "for my genius!" prompt -_CeruleanCityText_19677:: ; a4e07 (29:4e07) +_CeruleanCityText_19677:: text $53, ": Hey," line "guess what?" @@ -58,7 +58,7 @@ _CeruleanCityText_19677:: ; a4e07 (29:4e07) cont "Smell ya later!" done -_CeruleanCityText_196d9:: ; a4f27 (29:4f27) +_CeruleanCityText_196d9:: text "Hey! Stay out!" line "It's not your" cont "yard! Huh? Me?" @@ -68,16 +68,16 @@ _CeruleanCityText_196d9:: ; a4f27 (29:4f27) cont "you believe me?" done -_ReceivedTM28Text:: ; a4f82 (29:4f82) +_ReceivedTM28Text:: text $52, " recovered" line "TM28!@@" -_ReceivedTM28Text2:: ; a4f96 (29:4f96) +_ReceivedTM28Text2:: db $0 para "I better get" line "moving! Bye!@@" -_TM28NoRoomText:: ; a4fb3 (29:4fb3) +_TM28NoRoomText:: text "Make room for" line "this!" @@ -85,25 +85,25 @@ _TM28NoRoomText:: ; a4fb3 (29:4fb3) line "I give it to you!" done -_CeruleanCityText_196ee:: ; a4feb (29:4feb) +_CeruleanCityText_196ee:: text "Stop!" line "I give up! I'll" cont "leave quietly!" prompt -_CeruleanCityText_196f3:: ; a5010 (29:5010) +_CeruleanCityText_196f3:: text "OK! I'll return" line "the TM I stole!" prompt -_CeruleanCityText3:: ; a5030 (29:5030) +_CeruleanCityText3:: text "You're a trainer" line "too? Collecting," cont "fighting, it's a" cont "tough life." done -_CeruleanCityText4:: ; a506e (29:506e) +_CeruleanCityText4:: text "That bush in" line "front of the shop" cont "is in the way." @@ -112,23 +112,14 @@ _CeruleanCityText4:: ; a506e (29:506e) line "way around." done -_CeruleanCityText5:: ; a50ba (29:50ba) +_CeruleanCityText5:: text "You're making an" line "encyclopedia on" cont "#MON? That" cont "sounds amusing." done -_CeruleanCityText6:: ; a50f6 (29:50f6) -IF DEF(_YELLOW) - text "These poor people" - line "here were robbed." - - para "We're positive" - line "that TEAM ROCKET" - cont "is behind this" - cont "terrible deed." -ELSE +_CeruleanCityText6:: text "The people here" line "were robbed." @@ -136,57 +127,31 @@ ELSE line "TEAM ROCKET is" cont "behind this most" cont "heinous crime!" -ENDC para "Even our POLICE" -IF DEF(_YELLOW) - line "FORCE has trouble" -ELSE line "force has trouble" -ENDC cont "with the ROCKETs!" done -_CeruleanCityText_19730:: ; a5188 (29:5188) -IF DEF(_YELLOW) - text "OK! ELECTRODE!" -ELSE +_CeruleanCityText_19730:: text "OK! SLOWBRO!" -ENDC line "Use SONICBOOM!" -IF DEF(_YELLOW) - cont "Please ELECTRODE," -ELSE cont "Come on, SLOWBRO" -ENDC cont "pay attention!" done -_CeruleanCityText_19735:: ; a51c5 (29:51c5) -IF DEF(_YELLOW) - text "ELECTRODE, TACKLE!" -ELSE +_CeruleanCityText_19735:: text "SLOWBRO punch!" -ENDC line "No! You blew it" cont "again!" done -_CeruleanCityText_1973a:: ; a51ec (29:51ec) -IF DEF(_YELLOW) - text "ELECTRODE, SWIFT!" -ELSE +_CeruleanCityText_1973a:: text "SLOWBRO, WITHDRAW!" -ENDC line "No! That's wrong!" -IF DEF(_YELLOW) - para "Training #MON" - line "is difficult!" -ELSE para "It's so hard to" line "control #MON!" -ENDC para "Your #MON's" line "obedience depends" @@ -194,43 +159,27 @@ ENDC cont "as a trainer!" done -_CeruleanCityText_1976f:: ; a526b (29:526b) -IF DEF(_YELLOW) - text "ELECTRODE took a" -ELSE +_CeruleanCityText_1976f:: text "SLOWBRO took a" -ENDC line "snooze..." done -_CeruleanCityText_19774:: ; a5285 (29:5285) -IF DEF(_YELLOW) - text "ELECTRODE is" -ELSE +_CeruleanCityText_19774:: text "SLOWBRO is" -ENDC line "loafing around..." done -_CeruleanCityText_19779:: ; a52a3 (29:52a3) -IF DEF(_YELLOW) - text "ELECTRODE turned" -ELSE +_CeruleanCityText_19779:: text "SLOWBRO turned" -ENDC line "away..." done -_CeruleanCityText_1977e:: ; a52bb (29:52bb) -IF DEF(_YELLOW) - text "ELECTRODE" -ELSE +_CeruleanCityText_1977e:: text "SLOWBRO" -ENDC line "ignored orders..." done -_CeruleanCityText9:: ; a52d6 (29:52d6) +_CeruleanCityText9:: text "I want a bright" line "red BICYCLE!" @@ -239,7 +188,7 @@ _CeruleanCityText9:: ; a52d6 (29:52d6) cont "get dirty!" done -_CeruleanCityText10:: ; a531f (29:531f) +_CeruleanCityText10:: text "This is CERULEAN" line "CAVE! Horribly" cont "strong #MON" @@ -251,14 +200,14 @@ _CeruleanCityText10:: ; a531f (29:531f) cont "is allowed in!" done -_CeruleanCityText12:: ; a539a (29:539a) +_CeruleanCityText12:: text "CERULEAN CITY" line "A Mysterious," cont "Blue Aura" cont "Surrounds It" done -_CeruleanCityText13:: ; a53ce (29:53ce) +_CeruleanCityText13:: text "TRAINER TIPS" para "Pressing B Button" @@ -267,13 +216,13 @@ _CeruleanCityText13:: ; a53ce (29:53ce) cont "process." done -_CeruleanCityText16:: ; a541a (29:541a) +_CeruleanCityText16:: text "Grass and caves" line "handled easily!" cont "BIKE SHOP" done -_CeruleanCityText17:: ; a5445 (29:5445) +_CeruleanCityText17:: text "CERULEAN CITY" line "#MON GYM" cont "LEADER: MISTY" diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm index f4234fc4..c5d67004 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -1,12 +1,7 @@ -_CeruleanGymText_5c7be:: ; 989c1 (26:49c1) +_CeruleanGymText_5c7be:: text "Hi, you're a new" line "face!" -IF DEF(_YELLOW) - para "What's your policy" - line "on #MON? What" - cont "is your approach?" -ELSE para "Trainers who want" line "to turn pro have" cont "to have a policy" @@ -15,24 +10,14 @@ ELSE para "What is your" line "approach when you" cont "catch #MON?" -ENDC para "My policy is an" line "all-out offensive" cont "with water-type" cont "#MON!" - -IF DEF(_YELLOW) - para "MISTY, the world-" - line "famous beauty, is" - cont "your host!" - - para "Are you ready," - line "sweetie?" -ENDC done -_CeruleanGymText_5c7c3:: ; 98a7b (26:4a7b) +_CeruleanGymText_5c7c3:: text "TM11 teaches" line "BUBBLEBEAM!" @@ -40,7 +25,7 @@ _CeruleanGymText_5c7c3:: ; 98a7b (26:4a7b) line "aquatic #MON!" done -_CeruleanGymText_5c7c8:: ; 98ab0 (26:4ab0) +_CeruleanGymText_5c7c8:: text "The CASCADEBADGE" line "makes all #MON" cont "up to L30 obey!" @@ -50,11 +35,7 @@ _CeruleanGymText_5c7c8:: ; 98ab0 (26:4ab0) para "There's more, you" line "can now use CUT" -IF DEF(_YELLOW) - cont "anytime!" -ELSE cont "any time!" -ENDC para "You can CUT down" line "small bushes to" @@ -64,23 +45,18 @@ ENDC line "my favorite TM!" done -_ReceivedTM11Text:: ; 98b7d (26:4b7d) +_ReceivedTM11Text:: text $52, " received" line "TM11!@@" -_CeruleanGymText_5c7d3:: ; 98b90 (26:4b90) +_CeruleanGymText_5c7d3:: text "You better make" line "room for this!" done -_CeruleanGymText_5c7d8:: ; 98bb0 (26:4bb0) -IF DEF(_YELLOW) - text "I can't" - line "believe I lost!" -ELSE +_CeruleanGymText_5c7d8:: text "Wow!" line "You're too much!" -ENDC para "All right!" @@ -88,38 +64,38 @@ ENDC line "CASCADEBADGE to" cont "show you beat me!@@" -_CeruleanGymBattleText1:: ; 98c05 (26:4c05) +_CeruleanGymBattleText1:: text "I'm more than good" line "enough for you!" para "MISTY can wait!" done -_CeruleanGymEndBattleText1:: ; 98c38 (26:4c38) +_CeruleanGymEndBattleText1:: text "You" line "overwhelmed me!" prompt -_CeruleanGymAfterBattleText1:: ; 98c4d (26:4c4d) +_CeruleanGymAfterBattleText1:: text "You have to face" line "other trainers to" cont "find out how good" cont "you really are." done -_CeruleanGymBattleText2:: ; 98c93 (26:4c93) +_CeruleanGymBattleText2:: text "Splash!" para "I'm first up!" line "Let's do it!" done -_CeruleanGymEndBattleText2:: ; 98cb5 (26:4cb5) +_CeruleanGymEndBattleText2:: text "That" line "can't be!" prompt -_CeruleanGymAfterBattleText2:: ; 98cc4 (26:4cc4) +_CeruleanGymAfterBattleText2:: text "MISTY is going to" line "keep improving!" @@ -127,7 +103,7 @@ _CeruleanGymAfterBattleText2:: ; 98cc4 (26:4cc4) line "someone like you!" done -_CeruleanGymText_5c82a:: ; 98d0a (26:4d0a) +_CeruleanGymText_5c82a:: text "Yo! Champ in" line "making!" @@ -145,15 +121,11 @@ _CeruleanGymText_5c82a:: ; 98d0a (26:4d0a) line "electricity!" done -_CeruleanGymText_5c82f:: ; 98db0 (26:4db0) +_CeruleanGymText_5c82f:: text "You beat MISTY!" line "What'd I tell ya?" -IF DEF(_YELLOW) - para "You and me, kid," -ELSE para "You and me kid," -ENDC line "we make a pretty" cont "darn good team!" done diff --git a/text/maps/cerulean_mart.asm b/text/maps/cerulean_mart.asm index 936104ee..8ebe0c32 100644 --- a/text/maps/cerulean_mart.asm +++ b/text/maps/cerulean_mart.asm @@ -1,4 +1,4 @@ -_CeruleanMartText2:: ; 99012 (26:5012) +_CeruleanMartText2:: text "Use REPEL to keep" line "bugs and weak" cont "#MON away." @@ -9,7 +9,7 @@ _CeruleanMartText2:: ; 99012 (26:5012) cont "for best results!" done -_CeruleanMartText3:: ; 9907f (26:507f) +_CeruleanMartText3:: text "Have you seen any" line "RARE CANDY?" diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/cerulean_pokecenter.asm index 6cc93144..e7933988 100644 --- a/text/maps/cerulean_pokecenter.asm +++ b/text/maps/cerulean_pokecenter.asm @@ -1,4 +1,4 @@ -_CeruleanPokecenterText1:: ; 988e5 (26:48e5) +_CeruleanPokecenterText1:: text "That BILL!" para "I heard that" @@ -7,7 +7,7 @@ _CeruleanPokecenterText1:: ; 988e5 (26:48e5) cont "rare #MON!" done -_CeruleanPokecenterText3:: ; 9892a (26:492a) +_CeruleanPokecenterText3:: text "Have you heard" line "about BILL?" diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/cerulean_trade_house.asm index c22f24a9..b606613b 100644 --- a/text/maps/cerulean_trade_house.asm +++ b/text/maps/cerulean_trade_house.asm @@ -1,43 +1,4 @@ -IF DEF(_YELLOW) -MelanieText1:: - text "I nursed this" - line "BULBASAUR back to" - cont "health." - - para "It needs a good" - line "trainer to take" - cont "care of it now.@@" - -MelanieText2:: - text "I know! Would you" - line "take care of this" - cont "BULBASAUR?" - done - -MelanieText3:: - text "Please take care" - line "of BULBASAUR!@@" - -MelanieText4:: - text "Is BULBASAUR" - line "doing well?@@" - -MelanieText5:: - text "Oh..." - line "That's too bad...@@" - -MelanieBulbasaurText:: - text "BULBASAUR: Bubba!" - line "Zoar!@@" - -MelanieOddishText:: - text "ODDISH: Orddissh!@@" - -MelanieSandshrewText:: - text "SANDSHREW: Pikii!@@" -ENDC - -_CeruleanHouse1Text1:: ; 9888c (26:488c) +_CeruleanHouse1Text1:: text "My husband likes" line "trading #MON." diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/cerulean_trashed_house.asm index 83f87cb8..b23f4507 100644 --- a/text/maps/cerulean_trashed_house.asm +++ b/text/maps/cerulean_trashed_house.asm @@ -1,4 +1,4 @@ -_CeruleanTrashedText_1d6ab:: ; 9875c (26:475c) +_CeruleanTrashedText_1d6ab:: text "Those miserable" line "ROCKETs!" @@ -14,7 +14,7 @@ _CeruleanTrashedText_1d6ab:: ; 9875c (26:475c) line "bundle, it did!" done -_CeruleanTrashedText_1d6b0:: ; 987e2 (26:47e2) +_CeruleanTrashedText_1d6b0:: text "I figure what's" line "lost is lost!" @@ -23,14 +23,14 @@ _CeruleanTrashedText_1d6b0:: ; 987e2 (26:47e2) cont "DIG without a TM!" done -_CeruleanHouseTrashedText2:: ; 98834 (26:4834) +_CeruleanHouseTrashedText2:: text "TEAM ROCKET must" line "be trying to DIG" cont "their way into no" cont "good!" done -_CeruleanHouseTrashedText3:: ; 9886f (26:486f) +_CeruleanHouseTrashedText3:: text "TEAM ROCKET left" line "a way out!" done diff --git a/text/maps/champion.asm b/text/maps/champion.asm index 19484c23..eb0287af 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -1,4 +1,4 @@ -_GaryText_760f4:: ; 860e1 (21:60e1) +_GaryText_760f4:: text $53, ": Hey!" para "I was looking" @@ -35,7 +35,7 @@ _GaryText_760f4:: ; 860e1 (21:60e1) cont "in the world!" done -_GaryText_760f9:: ; 8623b (21:623b) +_GaryText_760f9:: text "NO!" line "That can't be!" cont "You beat my best!" @@ -49,7 +49,7 @@ _GaryText_760f9:: ; 8623b (21:623b) cont "It's not fair!" prompt -_GaryText_760fe:: ; 862b4 (21:62b4) +_GaryText_760fe:: text "Hahaha!" line "I won, I won!" @@ -65,7 +65,7 @@ _GaryText_760fe:: ; 862b4 (21:62b4) line "Hahaha!" prompt -_GaryText_76103:: ; 8632f (21:632f) +_GaryText_76103:: text "Why?" line "Why did I lose?" @@ -81,11 +81,11 @@ _GaryText_76103:: ; 8632f (21:632f) line "like to admit it." done -_GaryText2:: ; 863c1 (21:63c1) +_GaryText2:: text "OAK: ", $52, "!" done -_GaryText_76120:: ; 863ca (21:63ca) +_GaryText_76120:: text "OAK: So, you won!" line "Congratulations!" cont "You're the new" @@ -103,7 +103,7 @@ _GaryText_76120:: ; 863ca (21:63ca) line "come of age!" done -_GaryText_76125:: ; 86463 (21:6463) +_GaryText_76125:: text "OAK: ", $53, "! I'm" line "disappointed!" @@ -129,7 +129,7 @@ _GaryText_76125:: ; 86463 (21:6463) cont "a champ again!" done -_GaryText_7612a:: ; 86567 (21:6567) +_GaryText_7612a:: text "OAK: ", $52, "!" para "You understand" diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm index c3208a84..c8df3fe4 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -1,4 +1,4 @@ -_BlaineBattleText:: ; a0844 (28:4844) +_BlaineBattleText:: text "Hah!" para "I am BLAINE! I" @@ -13,14 +13,14 @@ _BlaineBattleText:: ; a0844 (28:4844) line "have BURN HEAL!" done -_BlaineEndBattleText:: ; a08c7 (28:48c7) +_BlaineEndBattleText:: text "I have" line "burnt out!" para "You have earned" line "the VOLCANOBADGE!@@" -_BlaineFireBlastText:: ; a08fd (28:48fd) +_BlaineFireBlastText:: text "FIRE BLAST is the" line "ultimate fire" cont "technique!" @@ -29,7 +29,7 @@ _BlaineFireBlastText:: ; a08fd (28:48fd) line "water #MON!" done -_BlaineBadgeText:: ; a0946 (28:4946) +_BlaineBadgeText:: text "Hah!" para "The VOLCANOBADGE" @@ -41,13 +41,13 @@ _BlaineBadgeText:: ; a0946 (28:4946) line "have this too!" done -_ReceivedTM38Text:: ; a09a8 (28:49a8) +_ReceivedTM38Text:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_TM38ExplanationText:: ; a09bc (28:49bc) +_TM38ExplanationText:: db $0 para "TM38 contains" line "FIRE BLAST!" @@ -60,23 +60,23 @@ _TM38ExplanationText:: ; a09bc (28:49bc) cont "good bets!" done -_TM38NoRoomText:: ; a0a1e (28:4a1e) +_TM38NoRoomText:: text "Make room for my" line "gift!" done -_CinnabarGymText_7595f:: ; a0a36 (28:4a36) +_CinnabarGymText_7595f:: text "Do you know how" line "hot #MON fire" cont "breath can get?" done -_CinnabarGymText_75964:: ; a0a65 (28:4a65) +_CinnabarGymText_75964:: text "Yow!" line "Hot, hot, hot!" prompt -_CinnabarGymText_75969:: ; a0a7a (28:4a7a) +_CinnabarGymText_75969:: text "Fire, or to be" line "more precise," cont "combustion..." @@ -85,66 +85,66 @@ _CinnabarGymText_75969:: ; a0a7a (28:4a7a) line "blah..." done -_CinnabarGymText_75994:: ; a0ac0 (28:4ac0) +_CinnabarGymText_75994:: text "I was a thief, but" line "I became straight" cont "as a trainer!" done -_CinnabarGymText_75999:: ; a0af4 (28:4af4) +_CinnabarGymText_75999:: text "I" line "surrender!" prompt -_CinnabarGymText_7599e:: ; a0b02 (28:4b02) +_CinnabarGymText_7599e:: text "I can't help" line "stealing other" cont "people's #MON!" done -_CinnabarGymText_759c9:: ; a0b2c (28:4b2c) +_CinnabarGymText_759c9:: text "You can't win!" line "I have studied" cont "#MON totally!" done -_CinnabarGymText_759ce:: ; a0b58 (28:4b58) +_CinnabarGymText_759ce:: text "Waah!" line "My studies!" prompt -_CinnabarGymText_759d3:: ; a0b6b (28:4b6b) +_CinnabarGymText_759d3:: text "My theories are" line "too complicated" cont "for you!" done -_CinnabarGymText_759fe:: ; a0b95 (28:4b95) +_CinnabarGymText_759fe:: text "I just like using" line "fire #MON!" done -_CinnabarGymText_75a03:: ; a0bb3 (28:4bb3) +_CinnabarGymText_75a03:: text "Too hot" line "to handle!" prompt -_CinnabarGymText_75a08:: ; a0bc7 (28:4bc7) +_CinnabarGymText_75a08:: text "I wish there was" line "a thief #MON!" cont "I'd use that!" done -_CinnabarGymText_75a33:: ; a0bf4 (28:4bf4) +_CinnabarGymText_75a33:: text "I know why BLAINE" line "became a trainer!" done -_CinnabarGymText_75a38:: ; a0c19 (28:4c19) +_CinnabarGymText_75a38:: text "Ow!" prompt -_CinnabarGymText_75a3d:: ; a0c1e (28:4c1e) +_CinnabarGymText_75a3d:: text "BLAINE was lost" line "in the mountains" cont "when a fiery bird" @@ -155,40 +155,40 @@ _CinnabarGymText_75a3d:: ; a0c1e (28:4c1e) cont "his way down!" done -_CinnabarGymText_75a68:: ; a0c90 (28:4c90) +_CinnabarGymText_75a68:: text "I've been to many" line "GYMs, but this is" cont "my favorite!" done -_CinnabarGymText_75a6d:: ; a0cc1 (28:4cc1) +_CinnabarGymText_75a6d:: text "Yowza!" line "Too hot!" prompt -_CinnabarGymText_75a72:: ; a0cd2 (28:4cd2) +_CinnabarGymText_75a72:: text "Us fire #MON" line "fans like PONYTA" cont "and NINETALES!" done -_CinnabarGymText_75a9d:: ; a0d00 (28:4d00) +_CinnabarGymText_75a9d:: text "Fire is weak" line "against H2O!" done -_CinnabarGymText_75aa2:: ; a0d1b (28:4d1b) +_CinnabarGymText_75aa2:: text "Oh!" line "Snuffed out!" prompt -_CinnabarGymText_75aa7:: ; a0d2d (28:4d2d) +_CinnabarGymText_75aa7:: text "Water beats fire!" line "But, fire melts" cont "ice #MON!" done -_CinnabarGymText_75ac2:: ; a0d5a (28:4d5a) +_CinnabarGymText_75ac2:: text "Yo! Champ in" line "making!" @@ -203,7 +203,7 @@ _CinnabarGymText_75ac2:: ; a0d5a (28:4d5a) line "some BURN HEALs!" done -_CinnabarGymText_75ac7:: ; a0dd9 (28:4dd9) +_CinnabarGymText_75ac7:: text $52, "! You beat" line "that fire brand!" done diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm index 897368d2..d43c4d66 100644 --- a/text/maps/cinnabar_island.asm +++ b/text/maps/cinnabar_island.asm @@ -1,37 +1,33 @@ -_CinnabarIslandText8:: ; a61cf (29:61cf) +_CinnabarIslandText8:: text "The door is" line "locked..." done -_CinnabarIslandText1:: ; a61e6 (29:61e6) +_CinnabarIslandText1:: text "CINNABAR GYM's" line "BLAINE is an odd" cont "man who has lived" cont "here for decades." done -_CinnabarIslandText2:: ; a622a (29:622a) +_CinnabarIslandText2:: text "Scientists conduct" line "experiments in" -IF DEF(_YELLOW) - cont "the burned-out" -ELSE cont "the burned out" -ENDC cont "building." done -_CinnabarIslandText3:: ; a6266 (29:6266) +_CinnabarIslandText3:: text "CINNABAR ISLAND" line "The Fiery Town of" cont "Burning Desire" done -_CinnabarIslandText6:: ; a6298 (29:6298) +_CinnabarIslandText6:: text "#MON LAB" done -_CinnabarIslandText7:: ; a62a2 (29:62a2) +_CinnabarIslandText7:: text "CINNABAR ISLAND" line "#MON GYM" cont "LEADER: BLAINE" diff --git a/text/maps/cinnabar_lab.asm b/text/maps/cinnabar_lab.asm index 712b139b..74161166 100644 --- a/text/maps/cinnabar_lab.asm +++ b/text/maps/cinnabar_lab.asm @@ -1,4 +1,4 @@ -_Lab1Text1:: ; a0df7 (28:4df7) +_Lab1Text1:: text "We study #MON" line "extensively here." @@ -7,23 +7,23 @@ _Lab1Text1:: ; a0df7 (28:4df7) cont "for examination." done -_Lab1Text2:: ; a0e49 (28:4e49) +_Lab1Text2:: text "A photo of the" line "LAB's founder," cont "DR.FUJI!" done -_Lab1Text3:: ; a0e70 (28:4e70) +_Lab1Text3:: text "#MON LAB" line "Meeting Room" done -_Lab1Text4:: ; a0e87 (28:4e87) +_Lab1Text4:: text "#MON LAB" line "R-and-D Room" done -_Lab1Text5:: ; a0e9e (28:4e9e) +_Lab1Text5:: text "#MON LAB" line "Testing Room" done diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm index cdbaca13..38deb1ee 100644 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ b/text/maps/cinnabar_lab_fossil_room.asm @@ -1,4 +1,4 @@ -_Lab4Text_75dc6:: ; a10e8 (28:50e8) +_Lab4Text_75dc6:: text "Hiya!" para "I am important" @@ -11,11 +11,11 @@ _Lab4Text_75dc6:: ; a10e8 (28:50e8) line "fossil for me?" prompt -_Lab4Text_75dcb:: ; a1145 (28:5145) +_Lab4Text_75dcb:: text "No! Is too bad!" done -_Lab4Text_75dd0:: ; a1156 (28:5156) +_Lab4Text_75dd0:: text "I take a little" line "time!" @@ -23,7 +23,7 @@ _Lab4Text_75dd0:: ; a1156 (28:5156) line "little while!" done -_Lab4Text_75dd5:: ; a118d (28:518d) +_Lab4Text_75dd5:: text "Where were you?" para "Your fossil is" @@ -35,7 +35,7 @@ _Lab4Text_75dd5:: ; a118d (28:518d) line "like I think!" prompt -_Lab4Text_610ae:: ; a11d6 (28:51d6) +_Lab4Text_610ae:: text "Oh! That is" line "@" TX_RAM wcd6d @@ -54,7 +54,7 @@ _Lab4Text_610ae:: ; a11d6 (28:51d6) cont "again!" done -_Lab4Text_610b3:: ; a1259 (28:5259) +_Lab4Text_610b3:: text "So! You hurry and" line "give me that!" @@ -64,7 +64,7 @@ _Lab4Text_610b3:: ; a1259 (28:5259) text "!" prompt -_Lab4Text_610b8:: ; a128f (28:528f) +_Lab4Text_610b8:: text "I take a little" line "time!" @@ -72,7 +72,7 @@ _Lab4Text_610b8:: ; a128f (28:528f) line "little while!" done -_Lab4Text_610bd:: ; a12c6 (28:52c6) +_Lab4Text_610bd:: text "Aiyah! You come" line "again!" done diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm index af5dc150..b8034889 100644 --- a/text/maps/cinnabar_lab_metronome_room.asm +++ b/text/maps/cinnabar_lab_metronome_room.asm @@ -1,4 +1,4 @@ -_TM35PreReceiveText:: ; a0f09 (28:4f09) +_TM35PreReceiveText:: text "Tch-tch-tch!" line "I made a cool TM!" @@ -6,13 +6,13 @@ _TM35PreReceiveText:: ; a0f09 (28:4f09) line "kinds of fun!" prompt -_ReceivedTM35Text:: ; a0f48 (28:4f48) +_ReceivedTM35Text:: text $52, " received " line "@" TX_RAM wcf4b text "!@@" -_TM35ExplanationText:: ; a0f5d (28:4f5d) +_TM35ExplanationText:: text "Tch-tch-tch!" line "That's the sound" cont "of a METRONOME!" @@ -23,18 +23,18 @@ _TM35ExplanationText:: ; a0f5d (28:4f5d) cont "it doesn't know!" done -_TM35NoRoomText:: ; a0fc7 (28:4fc7) +_TM35NoRoomText:: text "Your pack is" line "crammed full!" done -_Lab3Text2:: ; a0fe3 (28:4fe3) +_Lab3Text2:: text "EEVEE can evolve" line "into 1 of 3 kinds" cont "of #MON." done -_Lab3Text3:: ; a1010 (28:5010) +_Lab3Text3:: text "There's an e-mail" line "message!" @@ -58,7 +58,7 @@ _Lab3Text3:: ; a1010 (28:5010) para "..." done -_Lab3Text5:: ; a10d8 (28:50d8) +_Lab3Text5:: text "An amber pipe!" done diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/cinnabar_lab_trade_room.asm index 02571da8..3c0a4bfe 100644 --- a/text/maps/cinnabar_lab_trade_room.asm +++ b/text/maps/cinnabar_lab_trade_room.asm @@ -1,4 +1,4 @@ -_Lab2Text1:: ; a0eb5 (28:4eb5) +_Lab2Text1:: text "I found this very" line "strange fossil in" cont "MT.MOON!" diff --git a/text/maps/cinnabar_mart.asm b/text/maps/cinnabar_mart.asm index d7c50c9f..44292ca8 100644 --- a/text/maps/cinnabar_mart.asm +++ b/text/maps/cinnabar_mart.asm @@ -1,10 +1,10 @@ -_CinnabarMartText2:: ; a139b (28:539b) +_CinnabarMartText2:: text "Don't they have X" line "ATTACK? It's good" cont "for battles!" done -_CinnabarMartText3:: ; a13cb (28:53cb) +_CinnabarMartText3:: text "It never hurts to" line "have extra items!" done diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/cinnabar_pokecenter.asm index 09d9a120..e3e6cca9 100644 --- a/text/maps/cinnabar_pokecenter.asm +++ b/text/maps/cinnabar_pokecenter.asm @@ -1,5 +1,5 @@ -_CinnabarPokecenterText2:: ; a12de (28:52de) -_CinnabarPokecenterText1:: ; a12de (28:52de) +_CinnabarPokecenterText2:: +_CinnabarPokecenterText1:: text "You can cancel" line "evolution." @@ -9,7 +9,7 @@ _CinnabarPokecenterText1:: ; a12de (28:52de) cont "it the way it is." done -_CinnabarPokecenterText3:: ; a133e (28:533e) +_CinnabarPokecenterText3:: text "Do you have any" line "friends?" diff --git a/text/maps/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm index da99566b..3ec2b151 100644 --- a/text/maps/copycats_house_1f.asm +++ b/text/maps/copycats_house_1f.asm @@ -1,11 +1,11 @@ -_CopycatsHouse1FText1:: ; a14f7 (28:54f7) +_CopycatsHouse1FText1:: text "My daughter is so" line "self-centered." cont "She only has a" cont "few friends." done -_CopycatsHouse1FText2:: ; a1535 (28:5535) +_CopycatsHouse1FText2:: text "My daughter likes" line "to mimic people." @@ -15,11 +15,6 @@ _CopycatsHouse1FText2:: ; a1535 (28:5535) cont "around here!" done -_CopycatsHouse1FText3:: ; a1596 (28:5596) -IF DEF(_YELLOW) - text "CHANSEY: Chaan" - line "sey!@@" -ELSE +_CopycatsHouse1FText3:: text "CHANSEY: Chaan!" line "Sii!@@" -ENDC diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm index 85202aa8..8f59f22f 100644 --- a/text/maps/copycats_house_2f.asm +++ b/text/maps/copycats_house_2f.asm @@ -1,4 +1,4 @@ -_CopycatsHouse2FText_5ccd4:: ; a15ad (28:55ad) +_CopycatsHouse2FText_5ccd4:: text $52, ": Hi! Do" line "you like #MON?" @@ -15,7 +15,7 @@ _CopycatsHouse2FText_5ccd4:: ; a15ad (28:55ad) line "favorite hobby!" prompt -_TM31PreReceiveText:: ; a1636 (28:5636) +_TM31PreReceiveText:: text "Oh wow!" line "A # DOLL!" @@ -26,13 +26,13 @@ _TM31PreReceiveText:: ; a1636 (28:5636) line "this, then!" prompt -_ReceivedTM31Text:: ; a1675 (28:5675) +_ReceivedTM31Text:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_TM31ExplanationText1:: ; a1689 (28:5689) +_TM31ExplanationText1:: db $0 para "TM31 contains my" line "favorite, MIMIC!" @@ -40,7 +40,7 @@ _TM31ExplanationText1:: ; a1689 (28:5689) para "Use it on a good" line "#MON!@@" -_TM31ExplanationText2:: ; a16c5 (28:56c5) +_TM31ExplanationText2:: text $52, ": Hi!" line "Thanks for TM31!" @@ -54,11 +54,11 @@ _TM31ExplanationText2:: ; a16c5 (28:56c5) line "It's a scream!" done -_TM31NoRoomText:: ; a1733 (28:5733) +_TM31NoRoomText:: text "Don't you want" line "this?@@" -_CopycatsHouse2FText2:: ; a1749 (28:5749) +_CopycatsHouse2FText2:: text "DODUO: Giiih!" para "MIRROR MIRROR ON" @@ -67,19 +67,19 @@ _CopycatsHouse2FText2:: ; a1749 (28:5749) cont "OF ALL?" done -_CopycatsHouse2FText3:: ; a1792 (28:5792) +_CopycatsHouse2FText3:: text "This is a rare" line "#MON! Huh?" cont "It's only a doll!" done -_CopycatsHouse2FText6:: ; a17be (28:57be) +_CopycatsHouse2FText6:: text "A game with MARIO" line "wearing a bucket" cont "on his head!" done -_CopycatsHouse2FText_5cd17:: ; a17ef (28:57ef) +_CopycatsHouse2FText_5cd17:: text "..." para "My Secrets!" @@ -91,7 +91,7 @@ _CopycatsHouse2FText_5cd17:: ; a17ef (28:57ef) cont "CLEFAIRY!" done -_CopycatsHouse2FText_5cd1c:: ; a1842 (28:5842) +_CopycatsHouse2FText_5cd1c:: text "Huh? Can't see!" done diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm index 7c0c0311..e2e58c0c 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare_1.asm @@ -1,16 +1,16 @@ -_DayCareIntroText:: ; 8ab95 (22:6b95) +_DayCareIntroText:: text "I run a DAYCARE." line "Would you like me" cont "to raise one of" cont "your #MON?" done -_DayCareWhichMonText:: ; 8abd4 (22:6bd4) +_DayCareWhichMonText:: text "Which #MON" line "should I raise?" prompt -_DayCareWillLookAfterMonText:: ; 8abf0 (22:6bf0) +_DayCareWillLookAfterMonText:: text "Fine, I'll look" line "after @" TX_RAM wcd6d @@ -18,12 +18,12 @@ _DayCareWillLookAfterMonText:: ; 8abf0 (22:6bf0) cont "for a while." prompt -_DayCareComeSeeMeInAWhileText:: ; 8ac19 (22:6c19) +_DayCareComeSeeMeInAWhileText:: text "Come see me in" line "a while." done -_DayCareMonHasGrownText:: ; 8ac32 (22:6c32) +_DayCareMonHasGrownText:: text "Your @" TX_RAM wcd6d db $0 @@ -37,7 +37,7 @@ _DayCareMonHasGrownText:: ; 8ac32 (22:6c32) para "Aren't I great?" prompt -_DayCareOweMoneyText:: ; 8ac7d (22:6c7d) +_DayCareOweMoneyText:: text "You owe me ¥@" TX_BCD wDayCareTotalCost, $c2 db $0 @@ -45,14 +45,14 @@ _DayCareOweMoneyText:: ; 8ac7d (22:6c7d) cont "of this #MON." done -_DayCareGotMonBackText:: ; 8acae (22:6cae) +_DayCareGotMonBackText:: text $52, " got" line "@" TX_RAM wDayCareMonName text " back!" done -_DayCareMonNeedsMoreTimeText:: ; 8acc1 (22:6cc1) +_DayCareMonNeedsMoreTimeText:: text "Back already?" line "Your @" TX_RAM wcd6d diff --git a/text/maps/daycare_2.asm b/text/maps/daycare_2.asm index b5104e60..f0950812 100644 --- a/text/maps/daycare_2.asm +++ b/text/maps/daycare_2.asm @@ -1,37 +1,33 @@ -_DayCareAllRightThenText:: ; 8c000 (23:4000) +_DayCareAllRightThenText:: text "All right then," line "@@" -_DayCareComeAgainText:: ; 8c013 (23:4013) -IF DEF(_YELLOW) - text "Come again." -ELSE +_DayCareComeAgainText:: text "come again." -ENDC done -_DayCareNoRoomForMonText:: ; 8c020 (23:4020) +_DayCareNoRoomForMonText:: text "You have no room" line "for this #MON!" done -_DayCareOnlyHaveOneMonText:: ; 8c041 (23:4041) +_DayCareOnlyHaveOneMonText:: text "You only have one" line "#MON with you." done -_DayCareCantAcceptMonWithHMText:: ; 8c063 (23:4063) +_DayCareCantAcceptMonWithHMText:: text "I can't accept a" line "#MON that" cont "knows an HM move." done -_DayCareHeresYourMonText:: ; 8c090 (23:4090) +_DayCareHeresYourMonText:: text "Thank you! Here's" line "your #MON!" prompt -_DayCareNotEnoughMoneyText:: ; 8c0ad (23:40ad) +_DayCareNotEnoughMoneyText:: text "Hey, you don't" line "have enough ¥!" done diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/digletts_cave_route_11_entrance.asm index 782fc645..16cdb562 100644 --- a/text/maps/digletts_cave_route_11_entrance.asm +++ b/text/maps/digletts_cave_route_11_entrance.asm @@ -1,4 +1,4 @@ -_DiglettsCaveEntRoute11Text1:: ; 8c7f9 (23:47f9) +_DiglettsCaveEntRoute11Text1:: text "What a surprise!" line "DIGLETTs dug this" cont "long tunnel!" diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/digletts_cave_route_2_entrance.asm index cfa69aa2..f6d5589c 100644 --- a/text/maps/digletts_cave_route_2_entrance.asm +++ b/text/maps/digletts_cave_route_2_entrance.asm @@ -1,4 +1,4 @@ -_DiglettsCaveRoute2Text1:: ; 8a6a7 (22:66a7) +_DiglettsCaveRoute2Text1:: text "I went to ROCK" line "TUNNEL, but it's" cont "dark and scary." diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index bb1ca0f0..3e251e13 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -1,35 +1,15 @@ PikachuFanText:: text "Won't you admire" -IF DEF(_YELLOW) - line "my CLEFAIRY's" -ELSE line "my PIKACHU's" -ENDC cont "adorable tail?" done PikachuFanBetterText:: -IF DEF(_YELLOW) - text "Humph! My CLEFAIRY" -ELSE text "Humph! My PIKACHU" -ENDC line "is twice as cute" cont "as that one!" done -IF DEF(_YELLOW) -PikachuFanPrintText:: - text "Our CHAIRMAN's new" - line "hobby is taking" - cont "#MON photos." - - para "He gave me a nice" - line "PRINT of my cute" - cont "CLEFAIRY." - done -ENDC - SeelFanText:: text "I just love my" line "SEEL!" @@ -45,22 +25,9 @@ SeelFanBetterText:: line "more attractive!" done -IF DEF(_YELLOW) -SeelFanPrintText:: - text "I'm going to hook" - line "up the cable to" - cont "get a photo PRINT" - cont "of my SEEL!" - done -ENDC - FanClubPikachuText:: -IF DEF(_YELLOW) - text "CLEFAIRY: Pippii!" -ELSE text "PIKACHU: Chu!" line "Pikachu!" -ENDC done FanClubSeelText:: @@ -71,14 +38,8 @@ FanClubMeetChairText:: text "I chair the" line "#MON Fan Club!" -IF DEF(_YELLOW) - para "I have more than" - line "100 #MON. I" - cont "love them all!" -ELSE para "I have collected" line "over 100 #MON!" -ENDC para "I'm very fussy" line "when it comes to" @@ -86,13 +47,8 @@ ENDC para "So..." -IF DEF(_YELLOW) - para "Did you come to" - line "hear me brag" -ELSE para "Did you come" line "visit to hear" -ENDC cont "about my #MON?" done @@ -169,54 +125,19 @@ FanClubBagFullText:: line "this!" done -IF DEF(_YELLOW) -FanClubChairPrintText1:: - text "Hi there, ",$52,"!" - line "Have you seen my" - cont "#MON photos?" - - para "I have them framed" - line "up on that wall." - - para "Ah, I know!" - - para "Would you like me" - line "to take a photo" - cont "of your #MON?" - done - -FanClubChairPrintText2:: - text "No? That's really" - line "disappointing." - done - -FanClubChairPrintText3:: - text "OK, I'm done." - done - -FanClubChairPrintText4:: - text "Maybe we won't" - line "PRINT this now." - done -ENDC - -_FanClubText6:: ; 9a948 (26:6948) -IF DEF(_YELLOW) - text "Our CHAIRMAN is" -ELSE +_FanClubText6:: text "Our Chairman is" -ENDC line "very vocal about" cont "#MON." done -_FanClubText7:: ; 9a970 (26:6970) +_FanClubText7:: text "Let's all listen" line "politely to other" cont "trainers!" done -_FanClubText8:: ; 9a99d (26:699d) +_FanClubText8:: text "If someone brags," line "brag right back!" done diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm index 9cf7ba4e..e8cdfb2e 100644 --- a/text/maps/fighting_dojo.asm +++ b/text/maps/fighting_dojo.asm @@ -1,4 +1,4 @@ -_FightingDojoText_5ce8e:: ; a1852 (28:5852) +_FightingDojoText_5ce8e:: text "Grunt!" para "I am the KARATE" @@ -12,12 +12,12 @@ _FightingDojoText_5ce8e:: ; a1852 (28:5852) para "Fwaaa!" done -_FightingDojoText_5ce93:: ; a18ba (28:58ba) +_FightingDojoText_5ce93:: text "Hwa!" line "Arrgh! Beaten!" prompt -_FightingDojoText_5ce98:: ; a18cf (28:58cf) +_FightingDojoText_5ce98:: text "Indeed, I have" line "lost!" @@ -34,24 +34,24 @@ _FightingDojoText_5ce98:: ; a18cf (28:58cf) line "one you like!" done -_FightingDojoText_5ce9d:: ; a1972 (28:5972) +_FightingDojoText_5ce9d:: text "Ho!" para "Stay and train at" line "Karate with us!" done -_FightingDojoBattleText1:: ; a1999 (28:5999) +_FightingDojoBattleText1:: text "Hoargh! Take your" line "shoes off!" done -_FightingDojoEndBattleText1:: ; a19b7 (28:59b7) +_FightingDojoEndBattleText1:: text "I give" line "up!" prompt -_FightingDojoAfterBattleText1:: ; a19c3 (28:59c3) +_FightingDojoAfterBattleText1:: text "You wait 'til you" line "see our Master!" @@ -59,22 +59,22 @@ _FightingDojoAfterBattleText1:: ; a19c3 (28:59c3) line "compared to him!" done -_FightingDojoBattleText2:: ; a1a05 (28:5a05) +_FightingDojoBattleText2:: text "I hear you're" line "good! Show me!" done -_FightingDojoEndBattleText2:: ; a1a22 (28:5a22) +_FightingDojoEndBattleText2:: text "Judge!" line "1 point!" prompt -_FightingDojoAfterBattleText2:: ; a1a33 (28:5a33) +_FightingDojoAfterBattleText2:: text "Our Master is a" line "pro fighter!" done -_FightingDojoBattleText3:: ; a1a51 (28:5a51) +_FightingDojoBattleText3:: text "Nothing tough" line "frightens me!" @@ -82,18 +82,18 @@ _FightingDojoBattleText3:: ; a1a51 (28:5a51) line "for training!" done -_FightingDojoEndBattleText3:: ; a1a8d (28:5a8d) +_FightingDojoEndBattleText3:: text "Yow!" line "Stubbed fingers!" prompt -_FightingDojoAfterBattleText3:: ; a1aa4 (28:5aa4) +_FightingDojoAfterBattleText3:: text "The only thing" line "that frightens us" cont "is psychic power!" done -_FightingDojoBattleText4:: ; a1ad8 (28:5ad8) +_FightingDojoBattleText4:: text "Hoohah!" para "You're trespassing" @@ -101,38 +101,30 @@ _FightingDojoBattleText4:: ; a1ad8 (28:5ad8) cont "DOJO!" done -_FightingDojoEndBattleText4:: ; a1b09 (28:5b09) +_FightingDojoEndBattleText4:: text "Oof!" line "I give up!" prompt -_FightingDojoAfterBattleText4:: ; a1b1a (28:5b1a) +_FightingDojoAfterBattleText4:: text "The prime fighters" line "across the land" cont "train here." done -_WantHitmonleeText:: ; a1b4a (28:5b4a) +_WantHitmonleeText:: text "You want the" -IF DEF(_YELLOW) - line "hard-kicking" -ELSE line "hard kicking" -ENDC cont "HITMONLEE?" done -_WantHitmonchanText:: ; a1b70 (28:5b70) +_WantHitmonchanText:: text "You want the" -IF DEF(_YELLOW) - line "piston-punching" -ELSE line "piston punching" -ENDC cont "HITMONCHAN?" done -_OtherHitmonText:: ; a1b9a (28:5b9a) +_OtherHitmonText:: text "Better not get" line "greedy..." done diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm index bcb80d0e..3d6fa0c0 100644 --- a/text/maps/fuchsia_city.asm +++ b/text/maps/fuchsia_city.asm @@ -1,11 +1,11 @@ -_FuchsiaCityText1:: ; a5e9c (29:5e9c) +_FuchsiaCityText1:: text "Did you try the" line "SAFARI GAME? Some" cont "#MON can only" cont "be caught there." done -_FuchsiaCityText2:: ; a5ede (29:5ede) +_FuchsiaCityText2:: text "SAFARI ZONE has a" line "zoo in front of" cont "the entrance." @@ -15,71 +15,67 @@ _FuchsiaCityText2:: ; a5ede (29:5ede) cont "catching #MON." done -_FuchsiaCityText3:: ; a5f3e (29:5f3e) +_FuchsiaCityText3:: text "ERIK: Where's" line "SARA? I said I'd" cont "meet her here." done -_FuchsiaCityText4:: ; a5f6b (29:5f6b) +_FuchsiaCityText4:: text "That item ball in" line "there is really a" cont "#MON." done -_FuchsiaCityText5:: ; a5f96 (29:5f96) +_FuchsiaCityText5:: text "!" done -_FuchsiaCityText11:: ; a5f99 (29:5f99) +_FuchsiaCityText11:: text "FUCHSIA CITY" line "Behold! It's" cont "Passion Pink!" done -_FuchsiaCityText13:: ; a5fc1 (29:5fc1) +_FuchsiaCityText13:: text "SAFARI GAME" line "#MON-U-CATCH!" done -_FuchsiaCityText16:: ; a5fdc (29:5fdc) +_FuchsiaCityText16:: text "SAFARI ZONE" line "WARDEN's HOME" done -_FuchsiaCityText17:: ; a5ff6 (29:5ff6) +_FuchsiaCityText17:: text "#MON PARADISE" line "SAFARI ZONE" done -_FuchsiaCityText18:: ; a6011 (29:6011) +_FuchsiaCityText18:: text "FUCHSIA CITY" line "#MON GYM" cont "LEADER: KOGA" para "The Poisonous" -IF DEF(_YELLOW) - line "Ninja Master!" -ELSE line "Ninja Master" -ENDC done -_FuchsiaCityChanseyText:: ; a6050 (29:6050) +_FuchsiaCityChanseyText:: text "Name: CHANSEY" para "Catching one is" line "all up to chance." prompt -_FuchsiaCityVoltorbText:: ; a6081 (29:6081) +_FuchsiaCityVoltorbText:: text "Name: VOLTORB" para "The very image of" line "a # BALL." prompt -_FuchsiaCityKangaskhanText:: ; a60ac (29:60ac) +_FuchsiaCityKangaskhanText:: text "Name: KANGASKHAN" para "A maternal #MON" @@ -88,21 +84,21 @@ _FuchsiaCityKangaskhanText:: ; a60ac (29:60ac) cont "on its belly." prompt -_FuchsiaCitySlowpokeText:: ; a60fd (29:60fd) +_FuchsiaCitySlowpokeText:: text "Name: SLOWPOKE" para "Friendly and very" line "slow moving." prompt -_FuchsiaCityLaprasText:: ; a612c (29:612c) +_FuchsiaCityLaprasText:: text "Name: LAPRAS" para "A.K.A. the king" line "of the seas." prompt -_FuchsiaCityOmanyteText:: ; a6157 (29:6157) +_FuchsiaCityOmanyteText:: text "Name: OMANYTE" para "A #MON that" @@ -110,7 +106,7 @@ _FuchsiaCityOmanyteText:: ; a6157 (29:6157) cont "from a fossil." prompt -_FuchsiaCityKabutoText:: ; a6191 (29:6191) +_FuchsiaCityKabutoText:: text "Name: KABUTO" para "A #MON that" @@ -118,7 +114,7 @@ _FuchsiaCityKabutoText:: ; a6191 (29:6191) cont "from a fossil." prompt -_FuchsiaCityText_19b2a:: ; a61ca (29:61ca) +_FuchsiaCityText_19b2a:: text "..." done diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm index 23d0476b..4f0c98b5 100644 --- a/text/maps/fuchsia_fishing_house.asm +++ b/text/maps/fuchsia_fishing_house.asm @@ -1,4 +1,4 @@ -_FuchsiaHouse3Text_561bd:: ; a0695 (28:4695) +_FuchsiaHouse3Text_561bd:: text "I'm the FISHING" line "GURU's older" cont "brother!" @@ -10,7 +10,7 @@ _FuchsiaHouse3Text_561bd:: ; a0695 (28:4695) line "fish?" done -_FuchsiaHouse3Text_561c2:: ; a06e8 (28:46e8) +_FuchsiaHouse3Text_561c2:: text "Grand! I like" line "your style!" @@ -22,12 +22,12 @@ _FuchsiaHouse3Text_561c2:: ; a06e8 (28:46e8) TX_RAM wcf4b text "!@@" -_FuchsiaHouse3Text_56212:: ; a0737 (28:4737) +_FuchsiaHouse3Text_56212:: text "Oh... That's so" line "disappointing..." done -_FuchsiaHouse3Text_56217:: ; a0758 (28:4758) +_FuchsiaHouse3Text_56217:: text "Hello there," line $52, "!" @@ -35,7 +35,7 @@ _FuchsiaHouse3Text_56217:: ; a0758 (28:4758) line "biting?" done -_FuchsiaHouse3Text_5621c:: ; a0782 (28:4782) +_FuchsiaHouse3Text_5621c:: text "Oh no!" para "You have no room" diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/fuchsia_gym_1.asm index a877c0a1..3938f9af 100644 --- a/text/maps/fuchsia_gym_1.asm +++ b/text/maps/fuchsia_gym_1.asm @@ -1,4 +1,4 @@ -_KogaBeforeBattleText:: ; 9e9b1 (27:69b1) +_KogaBeforeBattleText:: text "KOGA: Fwahahaha!" para "A mere child like" @@ -16,7 +16,7 @@ _KogaBeforeBattleText:: ; 9e9b1 (27:69b1) cont "techniques!" done -_KogaAfterBattleText:: ; 9ea66 (27:6a66) +_KogaAfterBattleText:: text "Humph!" line "You have proven" cont "your worth!" diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm index 73c9d31e..8b7c84ac 100644 --- a/text/maps/fuchsia_gym_2.asm +++ b/text/maps/fuchsia_gym_2.asm @@ -1,4 +1,4 @@ -_KogaExplainToxicText:: ; a0000 (28:4000) +_KogaExplainToxicText:: text "When afflicted by" line "TOXIC, #MON" cont "suffer more and" @@ -9,7 +9,7 @@ _KogaExplainToxicText:: ; a0000 (28:4000) line "terrorize foes!" done -_FuchsiaGymText9:: ; a0069 (28:4069) +_FuchsiaGymText9:: text "Now that you have" line "the SOULBADGE," cont "the DEFENSE of" @@ -24,13 +24,13 @@ _FuchsiaGymText9:: ; a0069 (28:4069) line "too!" done -_ReceivedTM06Text:: ; a00eb (28:40eb) +_ReceivedTM06Text:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_TM06ExplanationText:: ; a00ff (28:40ff) +_TM06ExplanationText:: db $0 para "TM06 contains" line "TOXIC!" @@ -40,12 +40,12 @@ _TM06ExplanationText:: ; a00ff (28:40ff) cont "400 years old!" done -_TM06NoRoomText:: ; a0143 (28:4143) +_TM06NoRoomText:: text "Make space for" line "this, child!" done -_FuchsiaGymBattleText1:: ; a0160 (28:4160) +_FuchsiaGymBattleText1:: text "Strength isn't" line "the key for" cont "#MON!" @@ -57,54 +57,54 @@ _FuchsiaGymBattleText1:: ; a0160 (28:4160) cont "brute strength!" done -_FuchsiaGymEndBattleText1:: ; a01c2 (28:41c2) +_FuchsiaGymEndBattleText1:: text "What?" line "Extraordinary!" prompt -_FuchsiaGymAfterBattleText1:: ; a01d8 (28:41d8) +_FuchsiaGymAfterBattleText1:: text "So, you mix brawn" line "with brains?" cont "Good strategy!" done -_FuchsiaGymBattleText2:: ; a0207 (28:4207) +_FuchsiaGymBattleText2:: text "I wanted to become" line "a ninja, so I" cont "joined this GYM!" done -_FuchsiaGymEndBattleText2:: ; a023a (28:423a) +_FuchsiaGymEndBattleText2:: text "I'm done" line "for!" prompt -_FuchsiaGymAfterBattleText2:: ; a0248 (28:4248) +_FuchsiaGymAfterBattleText2:: text "I will keep on" line "training under" cont "KOGA, my ninja" cont "master!" done -_FuchsiaGymBattleText3:: ; a027e (28:427e) +_FuchsiaGymBattleText3:: text "Let's see you" line "beat my special" cont "techniques!" done -_FuchsiaGymEndBattleText3:: ; a02a8 (28:42a8) +_FuchsiaGymEndBattleText3:: text "You" line "had me fooled!" prompt -_FuchsiaGymAfterBattleText3:: ; a02bc (28:42bc) +_FuchsiaGymAfterBattleText3:: text "I like poison and" line "sleep techniques," cont "as they linger" cont "after battle!" done -_FuchsiaGymBattleText4:: ; a02fe (28:42fe) +_FuchsiaGymBattleText4:: text "Stop right there!" para "Our invisible" @@ -112,12 +112,12 @@ _FuchsiaGymBattleText4:: ; a02fe (28:42fe) cont "frustrated?" done -_FuchsiaGymEndBattleText4:: ; a033a (28:433a) +_FuchsiaGymEndBattleText4:: text "Whoa!" line "He's got it!" prompt -_FuchsiaGymAfterBattleText4:: ; a034d (28:434d) +_FuchsiaGymAfterBattleText4:: text "You impressed me!" line "Here's a hint!" @@ -126,7 +126,7 @@ _FuchsiaGymAfterBattleText4:: ; a034d (28:434d) cont "invisible walls!" done -_FuchsiaGymBattleText5:: ; a03a1 (28:43a1) +_FuchsiaGymBattleText5:: text "I also study the" line "way of the ninja" cont "with master KOGA!" @@ -136,16 +136,16 @@ _FuchsiaGymBattleText5:: ; a03a1 (28:43a1) cont "animals!" done -_FuchsiaGymEndBattleText5:: ; a0402 (28:4402) +_FuchsiaGymEndBattleText5:: text "Awoo!" prompt -_FuchsiaGymAfterBattleText5:: ; a0409 (28:4409) +_FuchsiaGymAfterBattleText5:: text "I still have much" line "to learn!" done -_FuchsiaGymBattleText6:: ; a0426 (28:4426) +_FuchsiaGymBattleText6:: text "Master KOGA comes" line "from a long line" cont "of ninjas!" @@ -154,12 +154,12 @@ _FuchsiaGymBattleText6:: ; a0426 (28:4426) line "descend from?" done -_FuchsiaGymEndBattleText6:: ; a0470 (28:4470) +_FuchsiaGymEndBattleText6:: text "Dropped" line "my balls!" prompt -_FuchsiaGymAfterBattleText6:: ; a0483 (28:4483) +_FuchsiaGymAfterBattleText6:: text "Where there is" line "light, there is" cont "shadow!" @@ -169,7 +169,7 @@ _FuchsiaGymAfterBattleText6:: ; a0483 (28:4483) cont "choose?" done -_FuchsiaGymText_7564e:: ; a04d2 (28:44d2) +_FuchsiaGymText_7564e:: text "Yo! Champ in" line "making!" @@ -186,7 +186,7 @@ _FuchsiaGymText_7564e:: ; a04d2 (28:44d2) cont "to reach him!" done -_FuchsiaGymText_75653:: ; a0574 (28:4574) +_FuchsiaGymText_75653:: text "It's amazing how" line "ninja can terrify" cont "even now!" diff --git a/text/maps/fuchsia_house.asm b/text/maps/fuchsia_house.asm index de613e3d..a4b14eb6 100644 --- a/text/maps/fuchsia_house.asm +++ b/text/maps/fuchsia_house.asm @@ -1,4 +1,4 @@ -_FuchsiaHouse1Text1:: ; 9e2a3 (27:62a3) +_FuchsiaHouse1Text1:: text "SAFARI ZONE's" line "WARDEN is old," cont "but still active!" @@ -7,7 +7,7 @@ _FuchsiaHouse1Text1:: ; 9e2a3 (27:62a3) line "false, though." done -_FuchsiaHouse1Text2:: ; 9e2f3 (27:62f3) +_FuchsiaHouse1Text2:: text "Hmm? You've met" line "BILL?" @@ -18,7 +18,7 @@ _FuchsiaHouse1Text2:: ; 9e2f3 (27:62f3) cont "even as a child!" done -_FuchsiaHouse1Text3:: ; 9e34d (27:634d) +_FuchsiaHouse1Text3:: text "BILL files his" line "own #MON data" cont "on his PC!" diff --git a/text/maps/fuchsia_mart.asm b/text/maps/fuchsia_mart.asm index fe05f2af..6764e3a8 100644 --- a/text/maps/fuchsia_mart.asm +++ b/text/maps/fuchsia_mart.asm @@ -1,4 +1,4 @@ -_FuchsiaMartText2:: ; 9e22e (27:622e) +_FuchsiaMartText2:: text "Do you have a" line "SAFARI ZONE flag?" @@ -6,7 +6,7 @@ _FuchsiaMartText2:: ; 9e22e (27:622e) line "or calendars?" done -_FuchsiaMartText3:: ; 9e26e (27:626e) +_FuchsiaMartText3:: text "Did you try X" line "SPEED? It speeds" cont "up a #MON in" diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/fuchsia_meeting_room.asm index cfd7e1c2..1fa81344 100644 --- a/text/maps/fuchsia_meeting_room.asm +++ b/text/maps/fuchsia_meeting_room.asm @@ -1,4 +1,4 @@ -_FuchsiaMeetingRoomText1:: ; a05a1 (28:45a1) +_FuchsiaMeetingRoomText1:: text "We nicknamed the" line "WARDEN SLOWPOKE." @@ -6,7 +6,7 @@ _FuchsiaMeetingRoomText1:: ; a05a1 (28:45a1) line "both look vacant!" done -_FuchsiaMeetingRoomText2:: ; a05e6 (28:45e6) +_FuchsiaMeetingRoomText2:: text "SLOWPOKE is very" line "knowledgeable" cont "about #MON!" @@ -16,7 +16,7 @@ _FuchsiaMeetingRoomText2:: ; a05e6 (28:45e6) cont "extinct #MON!" done -_FuchsiaMeetingRoomText3:: ; a0642 (28:4642) +_FuchsiaMeetingRoomText3:: text "SLOWPOKE came in," line "but I couldn't" cont "understand him." diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/fuchsia_pokecenter.asm index 7f9d1221..617c3b84 100644 --- a/text/maps/fuchsia_pokecenter.asm +++ b/text/maps/fuchsia_pokecenter.asm @@ -1,4 +1,4 @@ -_FuchsiaPokecenterText1:: ; 9e387 (27:6387) +_FuchsiaPokecenterText1:: text "You can't win" line "with just one" cont "strong #MON." @@ -8,7 +8,7 @@ _FuchsiaPokecenterText1:: ; 9e387 (27:6387) cont "them evenly." done -_FuchsiaPokecenterText3:: ; 9e3de (27:63de) +_FuchsiaPokecenterText3:: text "There's a narrow" line "trail west of" cont "VIRIDIAN CITY." diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm index b54c55f2..e75d46ea 100644 --- a/text/maps/fujis_house.asm +++ b/text/maps/fujis_house.asm @@ -1,16 +1,16 @@ -_LavenderHouse1Text_1d8d1:: ; 99e8d (26:5e8d) +_LavenderHouse1Text_1d8d1:: text "That's odd, MR.FUJI" line "isn't here." cont "Where'd he go?" done -_LavenderHouse1Text_1d8d6:: ; 99eba (26:5eba) +_LavenderHouse1Text_1d8d6:: text "MR.FUJI had been" line "praying alone for" cont "CUBONE's mother." done -_LavenderHouse1Text_1d8f4:: ; 99eee (26:5eee) +_LavenderHouse1Text_1d8f4:: text "This is really" line "MR.FUJI's house." @@ -21,19 +21,19 @@ _LavenderHouse1Text_1d8f4:: ; 99eee (26:5eee) cont "orphaned #MON!" done -_LavenderHouse1Text_1d8f9:: ; 99f4b (26:5f4b) +_LavenderHouse1Text_1d8f9:: text "It's so warm!" line "#MON are so" cont "nice to hug!" done -_LavenderHouse1Text3:: ; 99f72 (26:5f72) +_LavenderHouse1Text3:: text "PSYDUCK: Gwappa!@@" -_LavenderHouse1Text4:: ; 99f85 (26:5f85) +_LavenderHouse1Text4:: text "NIDORINO: Gaoo!@@" -_LavenderHouse1Text_1d94c:: ; 99f97 (26:5f97) +_LavenderHouse1Text_1d94c:: text "MR.FUJI: ", $52, "." para "Your #DEX quest" @@ -45,13 +45,13 @@ _LavenderHouse1Text_1d94c:: ; 99f97 (26:5f97) line "help your quest." prompt -_ReceivedFluteText:: ; 99ffb (26:5ffb) +_ReceivedFluteText:: text $52, " received" line "a @" TX_RAM wcf4b text "!@@" -_FluteExplanationText:: ; 9a011 (26:6011) +_FluteExplanationText:: db $0 para "Upon hearing #" line "FLUTE, sleeping" @@ -62,17 +62,17 @@ _FluteExplanationText:: ; 9a011 (26:6011) line "sleeping #MON." done -_FluteNoRoomText:: ; 9a069 (26:6069) +_FluteNoRoomText:: text "You must make" line "room for this!" done -_MrFujiAfterFluteText:: ; 9a087 (26:6087) +_MrFujiAfterFluteText:: text "MR.FUJI: Has my" line "FLUTE helped you?" done -_LavenderHouse1Text6:: ; 9a0aa (26:60aa) +_LavenderHouse1Text6:: text "#MON Monthly" line "Grand Prize" cont "Drawing!" diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index cb0cc622..cf79e221 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -1,10 +1,6 @@ -_HallofFameRoomText1:: ; 85fb5 (21:5fb5) +_HallofFameRoomText1:: text "OAK: Er-hem!" -IF DEF(_YELLOW) - line "Congratulations," -ELSE line "Congratulations" -ENDC cont $52, "!" para "This floor is the" diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/indigo_plateau_lobby.asm index b4b6d29d..bfac25c3 100644 --- a/text/maps/indigo_plateau_lobby.asm +++ b/text/maps/indigo_plateau_lobby.asm @@ -1,4 +1,4 @@ -_IndigoPlateauLobbyText1:: ; a13f0 (28:53f0) +_IndigoPlateauLobbyText1:: text "Yo! Champ in" line "making!" @@ -13,7 +13,7 @@ _IndigoPlateauLobbyText1:: ; a13f0 (28:53f0) cont "is it! Go for it!" done -_IndigoPlateauLobbyText3:: ; a148b (28:548b) +_IndigoPlateauLobbyText3:: text "From here on, you" line "face the ELITE" cont "FOUR one by one!" diff --git a/text/maps/lance.asm b/text/maps/lance.asm index 35ef3546..f6890896 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -1,10 +1,6 @@ -_LanceBeforeBattleText:: ; 85d3c (21:5d3c) +_LanceBeforeBattleText:: text "Ah! I heard about" -IF DEF(_YELLOW) - line "you, ", $52, "!" -ELSE line "you ", $52, "!" -ENDC para "I lead the ELITE" line "FOUR! You can" @@ -31,7 +27,7 @@ ENDC cont "with me, ", $52, "!" done -_LanceEndBattleText:: ; 85e64 (21:5e64) +_LanceEndBattleText:: text "That's it!" para "I hate to admit" @@ -39,7 +35,7 @@ _LanceEndBattleText:: ; 85e64 (21:5e64) cont "#MON master!" prompt -_LanceAfterBattleText:: ; 85e9e (21:5e9e) +_LanceAfterBattleText:: text "I still can't" line "believe my" cont "dragons lost to" diff --git a/text/maps/lavender_house.asm b/text/maps/lavender_house.asm index 0ae3a1fe..d92f0c68 100644 --- a/text/maps/lavender_house.asm +++ b/text/maps/lavender_house.asm @@ -1,7 +1,7 @@ -_LavenderHouse2Text1:: ; 9a238 (26:6238) +_LavenderHouse2Text1:: text "CUBONE: Kyarugoo!@@" -_LavenderHouse2Text_1d9dc:: ; 9a24c (26:624c) +_LavenderHouse2Text_1d9dc:: text "I hate those" line "horrible ROCKETs!" @@ -13,7 +13,7 @@ _LavenderHouse2Text_1d9dc:: ; 9a24c (26:624c) cont "from TEAM ROCKET!" done -_LavenderHouse2Text_1d9e1:: ; 9a2b9 (26:62b9) +_LavenderHouse2Text_1d9e1:: text "The GHOST of" line "#MON TOWER is" cont "gone!" diff --git a/text/maps/lavender_mart.asm b/text/maps/lavender_mart.asm index 53ebdae3..69b8096f 100644 --- a/text/maps/lavender_mart.asm +++ b/text/maps/lavender_mart.asm @@ -1,4 +1,4 @@ -_LavenderMartText2:: ; 9a104 (26:6104) +_LavenderMartText2:: text "I'm searching for" line "items that raise" cont "the abilities of" @@ -14,13 +14,13 @@ _LavenderMartText2:: ; 9a104 (26:6104) line "I can get them?" done -_LavenderMart_5c953:: ; 9a1b4 (26:61b4) +_LavenderMart_5c953:: text "You know REVIVE?" line "It revives any" cont "fainted #MON!" done -_LavenderMart_5c958:: ; 9a1e3 (26:61e3) +_LavenderMart_5c958:: text "I found a NUGGET" line "in the mountains." diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/lavender_pokecenter.asm index 9f8c3e34..d982fa75 100644 --- a/text/maps/lavender_pokecenter.asm +++ b/text/maps/lavender_pokecenter.asm @@ -1,12 +1,12 @@ -_LavenderPokecenterText4:: ; 9940e (26:540e) -_LavenderPokecenterText2:: ; 9940e (26:540e) -_LavenderPokecenterText1:: ; 9940e (26:540e) +_LavenderPokecenterText4:: +_LavenderPokecenterText2:: +_LavenderPokecenterText1:: text "TEAM ROCKET will" line "do anything for" cont "the sake of gold!" done -_LavenderPokecenterText3:: ; 99442 (26:5442) +_LavenderPokecenterText3:: text "I saw CUBONE's" line "mother die trying" cont "to escape from" diff --git a/text/maps/lavender_town.asm b/text/maps/lavender_town.asm index f6485c6f..d3b41ffa 100644 --- a/text/maps/lavender_town.asm +++ b/text/maps/lavender_town.asm @@ -1,14 +1,14 @@ -_LavenderTownText_4413c:: ; a5482 (29:5482) +_LavenderTownText_4413c:: text "Do you believe in" line "GHOSTs?" done -_LavenderTownText_44141:: ; a549d (29:549d) +_LavenderTownText_44141:: text "Really? So there" line "are believers..." done -_LavenderTownText_44146:: ; a54c0 (29:54c0) +_LavenderTownText_44146:: text "Hahaha, I guess" line "not." @@ -17,7 +17,7 @@ _LavenderTownText_44146:: ; a54c0 (29:54c0) cont "it's not real." done -_LavenderTownText2:: ; a5506 (29:5506) +_LavenderTownText2:: text "This town is known" line "as the grave site" cont "of #MON." @@ -27,7 +27,7 @@ _LavenderTownText2:: ; a5506 (29:5506) cont "#MON TOWER." done -_LavenderTownText3:: ; a555f (29:555f) +_LavenderTownText3:: text "GHOSTs appeared" line "in #MON TOWER." @@ -37,13 +37,13 @@ _LavenderTownText3:: ; a555f (29:555f) cont "ROCKETs killed." done -_LavenderTownText4:: ; a55bb (29:55bb) +_LavenderTownText4:: text "LAVENDER TOWN" line "The Noble Purple" cont "Town" done -_LavenderTownText5:: ; a55e0 (29:55e0) +_LavenderTownText5:: text "New SILPH SCOPE!" para "Make the Invisible" @@ -52,12 +52,12 @@ _LavenderTownText5:: ; a55e0 (29:55e0) para "SILPH CO." done -_LavenderTownText8:: ; a561d (29:561d) +_LavenderTownText8:: text "LAVENDER VOLUNTEER" line "#MON HOUSE" done -_LavenderTownText9:: ; a563c (29:563c) +_LavenderTownText9:: text "May the Souls of" line "#MON Rest Easy" cont "#MON TOWER" diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm index 2ec3c74d..91e90b75 100644 --- a/text/maps/lorelei.asm +++ b/text/maps/lorelei.asm @@ -1,4 +1,4 @@ -_LoreleiBeforeBattleText:: ; 865ef (21:65ef) +_LoreleiBeforeBattleText:: text "Welcome to" line "#MON LEAGUE!" @@ -21,12 +21,12 @@ _LoreleiBeforeBattleText:: ; 865ef (21:65ef) line "Are you ready?" done -_LoreleiEndBattleText:: ; 866c4 (21:66c4) +_LoreleiEndBattleText:: text "How" line "dare you!" prompt -_LoreleiAfterBattleText:: ; 866d3 (21:66d3) +_LoreleiAfterBattleText:: text "You're better" line "than I thought!" cont "Go on ahead!" @@ -36,7 +36,7 @@ _LoreleiAfterBattleText:: ; 866d3 (21:66d3) cont "LEAGUE power!" done -_LoreleiDontRunAwayText:: ; 86729 (21:6729) +_LoreleiDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/maps/mansion_1f.asm b/text/maps/mansion_1f.asm index 96cc4c21..3ddd5660 100644 --- a/text/maps/mansion_1f.asm +++ b/text/maps/mansion_1f.asm @@ -1,30 +1,30 @@ -_Mansion1BattleText2:: ; a07a8 (28:47a8) +_Mansion1BattleText2:: text "Who are you? There" line "shouldn't be" cont "anyone here." done -_Mansion1EndBattleText2:: ; a07d5 (28:47d5) +_Mansion1EndBattleText2:: text "Ouch!" prompt -_Mansion1AfterBattleText2:: ; a07dc (28:47dc) +_Mansion1AfterBattleText2:: text "A key? I don't" line "know what you're" cont "talking about." done -_MansionSwitchText:: ; a080a (28:480a) +_MansionSwitchText:: text "A secret switch!" para "Press it?" done -_MansionSwitchPressedText:: ; a0826 (28:4826) +_MansionSwitchPressedText:: text "Who wouldn't?" prompt -_MansionSwitchNotPressedText:: ; a0834 (28:4834) +_MansionSwitchNotPressedText:: text "Not quite yet!" done diff --git a/text/maps/mansion_2f.asm b/text/maps/mansion_2f.asm index 057e05e2..c7e12408 100644 --- a/text/maps/mansion_2f.asm +++ b/text/maps/mansion_2f.asm @@ -1,21 +1,21 @@ -_Mansion2BattleText1:: ; 852b7 (21:52b7) +_Mansion2BattleText1:: text "I can't get out!" line "This old place is" cont "one big puzzle!" done -_Mansion2EndBattleText1:: ; 852ea (21:52ea) +_Mansion2EndBattleText1:: text "Oh no!" line "My bag of loot!" prompt -_Mansion2AfterBattleText1:: ; 85302 (21:5302) +_Mansion2AfterBattleText1:: text "Switches open and" line "close alternating" cont "sets of doors!" done -_Mansion2Text3:: ; 85336 (21:5336) +_Mansion2Text3:: text "Diary: July 5" line "Guyana," cont "South America" @@ -25,24 +25,24 @@ _Mansion2Text3:: ; 85336 (21:5336) cont "in the jungle." done -_Mansion2Text4:: ; 85389 (21:5389) +_Mansion2Text4:: text "Diary: July 10" line "We christened the" cont "newly discovered" cont "#MON, MEW." done -_Mansion2Text_520c2:: ; 853c7 (21:53c7) +_Mansion2Text_520c2:: text "A secret switch!" para "Press it?" done -_Mansion2Text_520c7:: ; 853e3 (21:53e3) +_Mansion2Text_520c7:: text "Who wouldn't?" prompt -_Mansion2Text_520cc:: ; 853f1 (21:53f1) +_Mansion2Text_520cc:: text "Not quite yet!" done diff --git a/text/maps/mansion_3f.asm b/text/maps/mansion_3f.asm index e46532f9..7e48a844 100644 --- a/text/maps/mansion_3f.asm +++ b/text/maps/mansion_3f.asm @@ -1,34 +1,34 @@ -_Mansion3BattleText1:: ; 85401 (21:5401) +_Mansion3BattleText1:: text "This place is" line "like, huge!" done -_Mansion3EndBattleText1:: ; 8541c (21:541c) +_Mansion3EndBattleText1:: text "Ayah!" prompt -_Mansion3AfterBattleText1:: ; 85423 (21:5423) +_Mansion3AfterBattleText1:: text "I wonder where" line "my partner went." done -_Mansion3BattleText2:: ; 85444 (21:5444) +_Mansion3BattleText2:: text "My mentor once" line "lived here." done -_Mansion3EndBattleText2:: ; 85460 (21:5460) +_Mansion3EndBattleText2:: text "Whew!" line "Overwhelming!" prompt -_Mansion3AfterBattleText2:: ; 85475 (21:5475) +_Mansion3AfterBattleText2:: text "So, you're stuck?" line "Try jumping off" cont "over there!" done -_Mansion3Text5:: ; 854a3 (21:54a3) +_Mansion3Text5:: text "Diary: Feb. 6" line "MEW gave birth." diff --git a/text/maps/mansion_b1f.asm b/text/maps/mansion_b1f.asm index 761c2570..78de2abb 100644 --- a/text/maps/mansion_b1f.asm +++ b/text/maps/mansion_b1f.asm @@ -1,34 +1,34 @@ -_Mansion4BattleText1:: ; 854df (21:54df) +_Mansion4BattleText1:: text "Uh-oh. Where am" line "I now?" done -_Mansion4EndBattleText1:: ; 854f7 (21:54f7) +_Mansion4EndBattleText1:: text "Awooh!" prompt -_Mansion4AfterBattleText1:: ; 854ff (21:54ff) +_Mansion4AfterBattleText1:: text "You can find stuff" line "lying around." done -_Mansion4BattleText2:: ; 85521 (21:5521) +_Mansion4BattleText2:: text "This place is" line "ideal for a lab." done -_Mansion4EndBattleText2:: ; 85541 (21:5541) +_Mansion4EndBattleText2:: text "What" line "was that for?" prompt -_Mansion4AfterBattleText2:: ; 85555 (21:5555) +_Mansion4AfterBattleText2:: text "I like it here!" line "It's conducive to" cont "my studies!" done -_Mansion4Text7:: ; 85583 (21:5583) +_Mansion4Text7:: text "Diary; Sept. 1" line "MEWTWO is far too" cont "powerful." diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm index ed181eb6..78257980 100644 --- a/text/maps/mr_psychics_house.asm +++ b/text/maps/mr_psychics_house.asm @@ -1,17 +1,17 @@ -_TM29PreReceiveText:: ; a24fe (28:64fe) +_TM29PreReceiveText:: text "...Wait! Don't" line "say a word!" para "You wanted this!" prompt -_ReceivedTM29Text:: ; a252a (28:652a) +_ReceivedTM29Text:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_TM29ExplanationText:: ; a253e (28:653e) +_TM29ExplanationText:: text "TM29 is PSYCHIC!" para "It can lower the" @@ -19,7 +19,7 @@ _TM29ExplanationText:: ; a253e (28:653e) cont "abilities." done -_TM29NoRoomText:: ; a257c (28:657c) +_TM29NoRoomText:: text "Where do you plan" line "to put this?" done diff --git a/text/maps/mt_moon_1f.asm b/text/maps/mt_moon_1f.asm index 0577adf3..761a5240 100644 --- a/text/maps/mt_moon_1f.asm +++ b/text/maps/mt_moon_1f.asm @@ -1,123 +1,119 @@ -_MtMoon1BattleText2:: ; 80692 (20:4692) +_MtMoon1BattleText2:: text "WHOA! You shocked" line "me! Oh, you're" cont "just a kid!" done -_MtMoon1EndBattleText2:: ; 806bf (20:46bf) +_MtMoon1EndBattleText2:: text "Wow!" line "Shocked again!" prompt -_MtMoon1AfterBattleText2:: ; 806d4 (20:46d4) +_MtMoon1AfterBattleText2:: text "Kids like you" line "shouldn't be" cont "here!" done -_MtMoon1BattleText3:: ; 806f5 (20:46f5) +_MtMoon1BattleText3:: text "Did you come to" line "explore too?" done -_MtMoon1EndBattleText3:: ; 80713 (20:4713) +_MtMoon1EndBattleText3:: text "Losing" line "stinks!" prompt -_MtMoon1AfterBattleText3:: ; 80723 (20:4723) +_MtMoon1AfterBattleText3:: text "I came down here" line "to show off to" cont "girls." done -_MtMoon1BattleText4:: ; 8074b (20:474b) +_MtMoon1BattleText4:: text "Wow! It's way" line "bigger in here" cont "than I thought!" done -_MtMoon1EndBattleText4:: ; 80778 (20:4778) +_MtMoon1EndBattleText4:: text "Oh!" line "I lost it!" prompt -_MtMoon1AfterBattleText4:: ; 80788 (20:4788) +_MtMoon1AfterBattleText4:: text "How do you get" line "out of here?" done -_MtMoon1BattleText5:: ; 807a5 (20:47a5) +_MtMoon1BattleText5:: text "What! Don't sneak" line "up on me!" done -_MtMoon1EndBattleText5:: ; 807c1 (20:47c1) +_MtMoon1EndBattleText5:: text "My" line "#MON won't do!" prompt -_MtMoon1AfterBattleText5:: ; 807d3 (20:47d3) +_MtMoon1AfterBattleText5:: text "I have to find" line "stronger #MON." done -_MtMoon1BattleText6:: ; 807f2 (20:47f2) +_MtMoon1BattleText6:: text "What? I'm waiting" line "for my friends to" cont "find me here." done -_MtMoon1EndBattleText6:: ; 80824 (20:4824) +_MtMoon1EndBattleText6:: text "I lost?" prompt -_MtMoon1AfterBattleText6:: ; 8082d (20:482d) +_MtMoon1AfterBattleText6:: text "I heard there are" line "some very rare" cont "fossils here." done -_MtMoon1BattleText7:: ; 8085d (20:485d) +_MtMoon1BattleText7:: text "Suspicious men" line "are in the cave." cont "What about you?" done -_MtMoon1EndBattleText7:: ; 8088e (20:488e) +_MtMoon1EndBattleText7:: text "You" line "got me!" prompt -_MtMoon1AfterBattleText7:: ; 8089b (20:489b) +_MtMoon1AfterBattleText7:: text "I saw them! I'm" line "sure they're from" cont "TEAM ROCKET!" done -_MtMoon1BattleText8:: ; 808c9 (20:48c9) +_MtMoon1BattleText8:: text "Go through this" line "cave to get to" cont "CERULEAN CITY!" done -_MtMoon1EndBattleText8:: ; 808f8 (20:48f8) +_MtMoon1EndBattleText8:: text "I" line "lost." prompt -_MtMoon1AfterBattleText8:: ; 80901 (20:4901) +_MtMoon1AfterBattleText8:: text "ZUBAT is tough!" line "But, it can be" cont "useful if you" cont "catch one." done -_MtMoon1Text14:: ; 8093a (20:493a) +_MtMoon1Text14:: text "Beware! ZUBAT is" -IF DEF(_YELLOW) - line "a bloodsucker!" -ELSE line "a blood sucker!" -ENDC done diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/mt_moon_b1f.asm index 8421fdb0..85cdee66 100644 --- a/text/maps/mt_moon_b1f.asm +++ b/text/maps/mt_moon_b1f.asm @@ -1,4 +1,4 @@ -_MtMoonText1:: ; 8095c (20:495c) +_MtMoonText1:: db $0 done diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm index 64823871..462c9d3c 100644 --- a/text/maps/mt_moon_b2f.asm +++ b/text/maps/mt_moon_b2f.asm @@ -1,47 +1,24 @@ -IF DEF(_YELLOW) -_MtMoonJessieJamesText1:: - text "Stop right there!@@" - -_MtMoonJessieJamesText2:: - text "That fossil is" - line "TEAM ROCKET's!" - - para "Surrender now, or" - line "prepare to fight!" - done - -_MtMoonJessieJamesText3:: - text "A" - line "brat beat us?" - prompt - -_MtMoonJessieJamesText4:: - text "TEAM ROCKET, blast" - line "off at the speed" - cont "of light!@@" -ENDC - -_MtMoon3Text_49f24:: ; 8095e (20:495e) +_MtMoon3Text_49f24:: text "You want the" line "DOME FOSSIL?" done -_MtMoon3Text_49f64:: ; 80979 (20:4979) +_MtMoon3Text_49f64:: text "You want the" line "HELIX FOSSIL?" done -_MtMoon3Text_49f6f:: ; 80995 (20:4995) +_MtMoon3Text_49f6f:: text $52, " got the" line "@" TX_RAM wcf4b text "!@@" -_MtMoon3Text_49f7f:: ; 809a8 (20:49a8) +_MtMoon3Text_49f7f:: text "Look, you've got" line "no room for this.@@" -_MtMoon3Text_49f85:: ; 809cc (20:49cc) +_MtMoon3Text_49f85:: text "Hey, stop!" para "I found these" @@ -49,18 +26,18 @@ _MtMoon3Text_49f85:: ; 809cc (20:49cc) cont "both mine!" done -_MtMoon3Text_49f8a:: ; 80a01 (20:4a01) +_MtMoon3Text_49f8a:: text "OK!" line "I'll share!" prompt -_MtMoon3Text_49f8f:: ; 80a11 (20:4a11) +_MtMoon3Text_49f8f:: text "We'll each take" line "one!" cont "No being greedy!" done -_MtMoon3Text_49f94:: ; 80a37 (20:4a37) +_MtMoon3Text_49f94:: text "Far away, on" line "CINNABAR ISLAND," cont "there's a #MON" @@ -71,74 +48,74 @@ _MtMoon3Text_49f94:: ; 80a37 (20:4a37) cont "fossils." done -_MtMoon3Text_49f99:: ; 80a93 (20:4a93) +_MtMoon3Text_49f99:: text "All right. Then" line "this is mine!@@" -_MtMoon3BattleText2:: ; 80ab3 (20:4ab3) +_MtMoon3BattleText2:: text "TEAM ROCKET will" line "find the fossils," cont "revive and sell" cont "them for cash!" done -_MtMoon3EndBattleText2:: ; 80af6 (20:4af6) +_MtMoon3EndBattleText2:: text "Urgh!" line "Now I'm mad!" prompt -_MtMoon3AfterBattleText2:: ; 80b09 (20:4b09) +_MtMoon3AfterBattleText2:: text "You made me mad!" line "TEAM ROCKET will" cont "blacklist you!" done -_MtMoon3BattleText3:: ; 80b3b (20:4b3b) +_MtMoon3BattleText3:: text "We, TEAM ROCKET," line "are #MON" cont "gangsters!" done -_MtMoon3EndBattleText3:: ; 80b61 (20:4b61) +_MtMoon3EndBattleText3:: text "I blew" line "it!" prompt -_MtMoon3AfterBattleText3:: ; 80b6d (20:4b6d) +_MtMoon3AfterBattleText3:: text "Darn it all! My" line "associates won't" cont "stand for this!" done -_MtMoon3BattleText4:: ; 80b9e (20:4b9e) +_MtMoon3BattleText4:: text "We're pulling a" line "big job here!" cont "Get lost, kid!" done -_MtMoon3EndBattleText4:: ; 80bcb (20:4bcb) +_MtMoon3EndBattleText4:: text "So, you" line "are good." prompt -_MtMoon3AfterBattleText4:: ; 80bde (20:4bde) +_MtMoon3AfterBattleText4:: text "If you find a" line "fossil, give it" cont "to me and scram!" done -_MtMoon3BattleText5:: ; 80c0e (20:4c0e) +_MtMoon3BattleText5:: text "Little kids" line "should leave" cont "grown-ups alone!" done -_MtMoon3EndBattleText5:: ; 80c39 (20:4c39) +_MtMoon3EndBattleText5:: text "I'm" line "steamed!" prompt -_MtMoon3AfterBattleText5:: ; 80c46 (20:4c46) +_MtMoon3AfterBattleText5:: text "#MON lived" line "here long before" cont "people came." diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm index 2ae50a13..271008e7 100644 --- a/text/maps/mt_moon_pokecenter.asm +++ b/text/maps/mt_moon_pokecenter.asm @@ -1,4 +1,4 @@ -_MtMoonPokecenterText1:: ; 8a8eb (22:68eb) +_MtMoonPokecenterText1:: text "I've 6 # BALLs" line "set in my belt." @@ -6,7 +6,7 @@ _MtMoonPokecenterText1:: ; 8a8eb (22:68eb) line "carry 6 #MON." done -_MtMoonPokecenterText3:: ; 8a929 (22:6929) +_MtMoonPokecenterText3:: text "TEAM ROCKET" line "attacks CERULEAN" cont "citizens..." @@ -16,7 +16,7 @@ _MtMoonPokecenterText3:: ; 8a929 (22:6929) cont "news!" done -_MtMoonPokecenterText_4935c:: ; 8a976 (22:6976) +_MtMoonPokecenterText_4935c:: text "MAN: Hello, there!" line "Have I got a deal" cont "just for you!" @@ -27,23 +27,23 @@ _MtMoonPokecenterText_4935c:: ; 8a976 (22:6976) cont "What do you say?" done -_MtMoonPokecenterText_49361:: ; 8a9ec (22:69ec) +_MtMoonPokecenterText_49361:: text "No? I'm only" line "doing this as a" cont "favor to you!" done -_MtMoonPokecenterText_49366:: ; 8aa17 (22:6a17) +_MtMoonPokecenterText_49366:: text "You'll need more" line "money than that!" done -_MtMoonPokecenterText_4936b:: ; 8aa39 (22:6a39) +_MtMoonPokecenterText_4936b:: text "MAN: Well, I don't" line "give refunds!" done -_MtMoonPokecenterText5:: ; 8aa5a (22:6a5a) +_MtMoonPokecenterText5:: db $0 done diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index 7371a312..29b167b5 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -1,8 +1,8 @@ -_Museum1FText_5c21a:: ; 9652c (25:652c) +_Museum1FText_5c21a:: text "Come again!" done -_Museum1FText_5c21f:: ; 96539 (25:6539) +_Museum1FText_5c21f:: text "It's ¥50 for a" line "child's ticket." @@ -10,17 +10,17 @@ _Museum1FText_5c21f:: ; 96539 (25:6539) line "come in?" done -_Museum1FText_5c224:: ; 96572 (25:6572) +_Museum1FText_5c224:: text "Right, ¥50!" line "Thank you!" done -_Museum1FText_5c229:: ; 9658a (25:658a) +_Museum1FText_5c229:: text "You don't have" line "enough money." prompt -_Museum1FText_5c22e:: ; 965a7 (25:65a7) +_Museum1FText_5c22e:: text "You can't sneak" line "in the back way!" @@ -29,7 +29,7 @@ _Museum1FText_5c22e:: ; 965a7 (25:65a7) cont "AMBER is?" done -_Museum1FText_5c233:: ; 965f1 (25:65f1) +_Museum1FText_5c233:: text "There's a lab" line "somewhere trying" cont "to resurrect" @@ -37,28 +37,28 @@ _Museum1FText_5c233:: ; 965f1 (25:65f1) cont "from AMBER." done -_Museum1FText_5c238:: ; 96636 (25:6636) +_Museum1FText_5c238:: text "AMBER is fossil-" line "ized tree sap." done -_Museum1FText_5c23d:: ; 96657 (25:6657) +_Museum1FText_5c23d:: text "Please go to the" line "other side!" done -_Museum1FText_5c242:: ; 96675 (25:6675) +_Museum1FText_5c242:: text "Take plenty of" line "time to look!" done -_Museum1FText_5c251:: ; 96693 (25:6693) +_Museum1FText_5c251:: text "That is one" line "magnificent" cont "fossil!" done -_Museum1FText_5c28e:: ; 966b4 (25:66b4) +_Museum1FText_5c28e:: text "Ssh! I think that" line "this chunk of" cont "AMBER contains" @@ -72,11 +72,7 @@ _Museum1FText_5c28e:: ; 966b4 (25:66b4) para "But, my colleagues" line "just ignore me!" -IF DEF(_YELLOW) - para "So, I have a favor" -ELSE para "So I have a favor" -ENDC line "to ask!" para "Take this to a" @@ -84,28 +80,28 @@ ENDC cont "get it examined!" prompt -_ReceivedOldAmberText:: ; 96790 (25:6790) +_ReceivedOldAmberText:: text $52, " received" line "OLD AMBER!@@" -_Museum1FText_5c299:: ; 967a8 (25:67a8) +_Museum1FText_5c299:: text "Ssh! Get the OLD" line "AMBER checked!" done -_Museum1FText_5c29e:: ; 967c9 (25:67c9) +_Museum1FText_5c29e:: text "You don't have" line "space for this!" done -_Museum1FText_5c2ad:: ; 967e8 (25:67e8) +_Museum1FText_5c2ad:: text "We are proud of 2" line "fossils of very" cont "rare, prehistoric" cont "#MON!" done -_Museum1FText_5c2bc:: ; 96823 (25:6823) +_Museum1FText_5c2bc:: text "The AMBER is" line "clear and gold!" done diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm index 46238725..4f34a249 100644 --- a/text/maps/museum_2f.asm +++ b/text/maps/museum_2f.asm @@ -1,11 +1,11 @@ -_Museum2FText1:: ; 96841 (25:6841) +_Museum2FText1:: text "MOON STONE?" para "What's so special" line "about it?" done -_Museum2FText2:: ; 96869 (25:6869) +_Museum2FText2:: text "July 20, 1969!" para "The 1st lunar" @@ -15,12 +15,12 @@ _Museum2FText2:: ; 96869 (25:6869) line "TV to watch it!" done -_Museum2FText3:: ; 968b1 (25:68b1) +_Museum2FText3:: text "We have a space" line "exhibit now." done -_Museum2FText4:: ; 968cf (25:68cf) +_Museum2FText4:: text "I want a PIKACHU!" line "It's so cute!" @@ -28,32 +28,17 @@ _Museum2FText4:: ; 968cf (25:68cf) line "to catch me one!" done -_Museum2FText5:: ; 96911 (25:6911) +_Museum2FText5:: text "Yeah, a PIKACHU" line "soon, I promise!" done -IF DEF(_YELLOW) -_Museum2FPikachuText1:: - text "Your PIKACHU looks" - line "untamed." - cont "May I have it for" - cont "my daughter?" - done - -_Museum2FPikachuText2:: - text "I'd like to get" - line "that PIKACHU off" - cont "you, but it's too" - cont "attached to you." -ENDC - -_Museum2FText6:: ; 96933 (25:6933) +_Museum2FText6:: text "SPACE SHUTTLE" line "COLUMBIA" done -_Museum2FText7:: ; 9694b (25:694b) +_Museum2FText7:: text "Meteorite that" line "fell on MT.MOON." cont "(MOON STONE?)" diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm index 052a9588..f43aef91 100644 --- a/text/maps/name_rater.asm +++ b/text/maps/name_rater.asm @@ -1,4 +1,4 @@ -_NameRaterText_1dab3:: ; 9a308 (26:6308) +_NameRaterText_1dab3:: text "Hello, hello!" line "I am the official" cont "NAME RATER!" @@ -8,12 +8,12 @@ _NameRaterText_1dab3:: ; 9a308 (26:6308) cont "your #MON?" done -_NameRaterText_1dab8:: ; 9a361 (26:6361) +_NameRaterText_1dab8:: text "Which #MON" line "should I look at?" prompt -_NameRaterText_1dabd:: ; 9a37f (26:637f) +_NameRaterText_1dabd:: TX_RAM wcd6d text ", is it?" line "That is a decent" @@ -26,12 +26,12 @@ _NameRaterText_1dabd:: ; 9a37f (26:637f) para "How about it?" done -_NameRaterText_1dac2:: ; 9a3e5 (26:63e5) +_NameRaterText_1dac2:: text "Fine! What should" line "we name it?" prompt -_NameRaterText_1dac7:: ; 9a404 (26:6404) +_NameRaterText_1dac7:: text "OK! This #MON" line "has been renamed" cont "@" @@ -42,16 +42,12 @@ _NameRaterText_1dac7:: ; 9a404 (26:6404) line "name than before!" done -_NameRaterText_1dacc:: ; 9a44c (26:644c) -IF DEF(_YELLOW) - text "Fine! Come any-" -ELSE +_NameRaterText_1dacc:: text "Fine! Come any" -ENDC line "time you like!" done -_NameRaterText_1dad1:: ; 9a46b (26:646b) +_NameRaterText_1dad1:: TX_RAM wcd6d text ", is it?" line "That is a truly" diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 6a3c6da6..9aaac71c 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -1,22 +1,10 @@ -_OaksLabGaryText1:: ; 94d5b (25:4d5b) +_OaksLabGaryText1:: text $53,": Yo" line $52,"! Gramps" cont "isn't around!" - -IF DEF(_YELLOW) - para "I ran here 'cos" - line "he said he had a" - cont "#MON for me." -ENDC done -_OaksLabText40:: ; 94d79 (25:4d79) -IF DEF(_YELLOW) - text $53,": Humph!" - line "I'll get a better" - cont "#MON than you!" - done -ELSE +_OaksLabText40:: text $53,": Heh, I" line "don't need to be" cont "greedy like you!" @@ -24,105 +12,74 @@ ELSE para "Go ahead and" line "choose, ", $52, "!" done -ENDC -_OaksLabText41:: ; 94dbd (25:4dbd) -IF DEF(_YELLOW) - text $53,": Heh, my" -ELSE +_OaksLabText41:: text $53,": My" -ENDC line "#MON looks a" cont "lot stronger." done -_OaksLabText39:: ; 94ddf (25:4ddf) -IF DEF(_YELLOW) - text "That's a #" - line "BALL. There's a" - cont "#MON inside!" - done -ELSE +_OaksLabText39:: text "Those are #" line "BALLs. They" cont "contain #MON!" done -ENDC -IF DEF(_YELLOW) -_OaksLabPikachuText:: - text "OAK: Go ahead," - line "it's yours!" - done -ENDC - -_OaksLabCharmanderText:: ; 94e06 (25:4e06) +_OaksLabCharmanderText:: text "So! You want the" line "fire #MON," cont "CHARMANDER?" done -_OaksLabSquirtleText:: ; 94e2f (25:4e2f) +_OaksLabSquirtleText:: text "So! You want the" line "water #MON," cont "SQUIRTLE?" done -_OaksLabBulbasaurText:: ; 94e57 (25:4e57) +_OaksLabBulbasaurText:: text "So! You want the" line "plant #MON," cont "BULBASAUR?" done -_OaksLabMonEnergeticText:: ; 94e80 (25:4e80) +_OaksLabMonEnergeticText:: text "This #MON is" line "really energetic!" prompt -_OaksLabReceivedMonText:: ; 94ea0 (25:4ea0) +_OaksLabReceivedMonText:: text $52, " received" line "a @" TX_RAM wcd6d text "!@@" -_OaksLabLastMonText:: ; 94eb6 (25:4eb6) +_OaksLabLastMonText:: text "That's PROF.OAK's" line "last #MON!" done -_OaksLabText_1d2f0:: ; 94ed2 (25:4ed2) +_OaksLabText_1d2f0:: text "OAK: Now, ", $52, "," line "which #MON do" cont "you want?" done -_OaksLabText_1d2f5:: ; 94ef8 (25:4ef8) +_OaksLabText_1d2f5:: text "OAK: If a wild" line "#MON appears," cont "your #MON can" cont "fight against it!" - -IF DEF(_YELLOW) - para "Afterward, go on" - line "to the next town." -ENDC done -_OaksLabText_1d2fa:: ; 94f36 (25:4f36) -IF DEF(_YELLOW) - text "OAK: You should" - line "talk to it and" - cont "see how it feels." - done -ELSE +_OaksLabText_1d2fa:: text "OAK: ", $52, "," line "raise your young" cont "#MON by making" cont "it fight!" done -ENDC -_OaksLabDeliverParcelText1:: ; 94f69 (25:4f69) +_OaksLabDeliverParcelText1:: text "OAK: Oh, ", $52, "!" para "How is my old" @@ -141,29 +98,21 @@ _OaksLabDeliverParcelText1:: ; 94f69 (25:4f69) para $52, " delivered" line "OAK's PARCEL.@@" -_OaksLabDeliverParcelText2:: ; 9500f (25:500f) +_OaksLabDeliverParcelText2:: db $0 para "Ah! This is the" line "custom # BALL" cont "I ordered!" -IF DEF(_YELLOW) - cont "Thanks, ",$52,"!" - - para "By the way, I must" - line "ask you to do" - cont "something for me." -ELSE cont "Thank you!" -ENDC done -_OaksLabAroundWorldText:: ; 95045 (25:5045) +_OaksLabAroundWorldText:: text "#MON around the" line "world wait for" cont "you, ", $52, "!" done -_OaksLabGivePokeballsText1:: ; 9506d (25:506d) +_OaksLabGivePokeballsText1:: text "OAK: You can't get" line "detailed data on" cont "#MON by just" @@ -177,18 +126,13 @@ _OaksLabGivePokeballsText1:: ; 9506d (25:506d) para $52, " got 5" line "# BALLs!@@" -_OaksLabGivePokeballsText2:: ; 950f2 (25:50f2) +_OaksLabGivePokeballsText2:: db $0 para "When a wild" line "#MON appears," cont "it's fair game." -IF DEF(_YELLOW) - para "Just like I showed" - line "you, throw a #" -ELSE para "Just throw a #" -ENDC line "BALL at it and try" line "to catch it!" @@ -200,7 +144,7 @@ ENDC cont "have to be lucky!" done -_OaksLabPleaseVisitText:: ; 9519e (25:519e) +_OaksLabPleaseVisitText:: text "OAK: Come see me" line "sometimes." @@ -209,7 +153,7 @@ _OaksLabPleaseVisitText:: ; 9519e (25:519e) cont "coming along." done -_OaksLabText_1d31d:: ; 951e9 (25:51e9) +_OaksLabText_1d31d:: text "OAK: Good to see " line "you! How is your " cont "#DEX coming? " @@ -217,17 +161,17 @@ _OaksLabText_1d31d:: ; 951e9 (25:51e9) cont "a look!" prompt -_OaksLabText_1d32c:: ; 95236 (25:5236) +_OaksLabText_1d32c:: text "It's encyclopedia-" line "like, but the" cont "pages are blank!" done -_OaksLabText8:: ; 95268 (25:5268) +_OaksLabText8:: text "?" done -_OaksLabText_1d340:: ; 9526b (25:526b) +_OaksLabText_1d340:: text "PROF.OAK is the" line "authority on" cont "#MON!" @@ -237,36 +181,13 @@ _OaksLabText_1d340:: ; 9526b (25:526b) cont "in high regard!" done -_OaksLabRivalWaitingText:: ; 952bb (25:52bb) +_OaksLabRivalWaitingText:: text $53, ": Gramps!" line "I'm fed up with" cont "waiting!" done -_OaksLabChooseMonText:: ; 952df (25:52df) -IF DEF(_YELLOW) - text "OAK: Hmm? ",$53,"?" - line "Why are you here" - cont "already?" - - para "I said for you to" - line "come by later..." - - para "Ah, whatever!" - line "Just wait there." - - para "Look, ",$52,"! Do" - line "you see that ball" - cont "on the table?" - - para "It's called a #" - line "BALL. It holds a" - cont "#MON inside." - - para "You may have it!" - line "Go on, take it!" - done -ELSE +_OaksLabChooseMonText:: text "OAK: ", $53, "?" line "Let me think..." @@ -293,97 +214,36 @@ ELSE cont "but you can have" cont "one! Choose!" done -ENDC -_OaksLabRivalInterjectionText:: ; 953dc (25:53dc) +_OaksLabRivalInterjectionText:: text $53, ": Hey!" line "Gramps! What" cont "about me?" done -_OaksLabBePatientText:: ; 953fc (25:53fc) -IF DEF(_YELLOW) - text "OAK: Be patient," - line $53,", I'll give" - cont "you one later." - done -ELSE +_OaksLabBePatientText:: text "OAK: Be patient!" line $53, ", you can" cont "have one too!" done -ENDC - -IF DEF(_YELLOW) -_OaksLabRivalTakesText1:: - text $53,": No way!" - line $52,", I want" - cont "this #MON!" - prompt - -_OaksLabRivalTakesText2:: - text $53," snatched" - line "the #MON!@@" - -_OaksLabRivalTakesText3:: - text "OAK: ",$53,"! What" - line "are you doing?" - prompt - -_OaksLabRivalTakesText4:: - text $53,": Gramps, I" - line "want this one!" - prompt - -_OaksLabRivalTakesText5:: - text "OAK: But, I... Oh," - line "all right then." - cont "That #MON is" - cont "yours." - - para "I was going to" - line "give you one" - cont "anyway..." - - para $52,", come over" - line "here." - done - -_OaksLabOakGivesText:: - text "OAK: ",$52,", this" - line "is the #MON I" - cont "caught earlier." - para "You can have it." - line "I caught it in" - cont "the wild and it's" - cont "not tame yet." - prompt - -_OaksLabReceivedText:: - text $52," received" - line "a " - TX_RAM $CD6D - text "!@@" -ENDC - -_OaksLabLeavingText:: ; 95427 (25:5427) +_OaksLabLeavingText:: text "OAK: Hey! Don't go" line "away yet!" done -_OaksLabRivalPickingMonText:: ; 95444 (25:5444) +_OaksLabRivalPickingMonText:: text $53, ": I'll take" line "this one, then!" done -_OaksLabRivalReceivedMonText:: ; 95461 (25:5461) +_OaksLabRivalReceivedMonText:: text $53, " received" line "a @" TX_RAM wcd6d text "!@@" -_OaksLabRivalChallengeText:: ; 95477 (25:5477) +_OaksLabRivalChallengeText:: text $53, ": Wait" line $52, "!" cont "Let's check out" @@ -393,19 +253,19 @@ _OaksLabRivalChallengeText:: ; 95477 (25:5477) line "you on!" done -_OaksLabText_1d3be:: ; 954b6 (25:54b6) +_OaksLabText_1d3be:: text "WHAT?" line "Unbelievable!" cont "I picked the" cont "wrong #MON!" prompt -_OaksLabText_1d3c3:: ; 954e4 (25:54e4) +_OaksLabText_1d3c3:: text $53, ": Yeah! Am" line "I great or what?" prompt -_OaksLabRivalToughenUpText:: ; 95502 (25:5502) +_OaksLabRivalToughenUpText:: text $53, ": Okay!" line "I'll make my" cont "#MON fight to" @@ -415,66 +275,22 @@ _OaksLabRivalToughenUpText:: ; 95502 (25:5502) line "Smell you later!" done -IF DEF(_YELLOW) -_OaksLabPikachuDislikesPokeballsText1:: - text "OAK: What?" - done - -_OaksLabPikachuDislikesPokeballsText2:: - text "OAK: Would you" - line "look at that!" - - para "It's odd, but it" - line "appears that your" - cont "PIKACHU dislikes" - cont "# BALLs." - - para "You should just" - line "keep it with you." - - para "That should make" - line "it happy!" - - para "You can talk to it" - line "and see how it" - cont "feels about you." - done -ENDC - -_OaksLabText21:: ; 95551 (25:5551) +_OaksLabText21:: text $53, ": Gramps!" done -_OaksLabText22:: ; 9555d (25:555d) -IF DEF(_YELLOW) - text $53,": Gramps," - line "my #MON has" - cont "grown stronger!" - cont "Check it out!" - done -ELSE +_OaksLabText22:: text $53, ": What did" line "you call me for?" done -ENDC -_OaksLabText23:: ; 9557b (25:557b) -IF DEF(_YELLOW) - text "OAK: Ah, ",$53,"," - line "good timing!" - - para "I needed to ask" - line "both of you to do" - cont "something for me." - done -ELSE +_OaksLabText23:: text "OAK: Oh right! I" line "have a request" cont "of you two." done -ENDC -_OaksLabText24:: ; 955a8 (25:55a8) +_OaksLabText24:: text "On the desk there" line "is my invention," cont "#DEX!" @@ -488,7 +304,7 @@ _OaksLabText24:: ; 955a8 (25:55a8) line "encyclopedia!" done -_OaksLabText25:: ; 9562a (25:562a) +_OaksLabText25:: text "OAK: ", $52, " and" line $53, "! Take" cont "these with you!" @@ -496,7 +312,7 @@ _OaksLabText25:: ; 9562a (25:562a) para $52, " got" line "#DEX from OAK!@@" -_OaksLabText26:: ; 95664 (25:5664) +_OaksLabText26:: text "To make a complete" line "guide on all the" cont "#MON in the" @@ -519,7 +335,7 @@ _OaksLabText26:: ; 95664 (25:5664) cont "#MON history!" done -_OaksLabText27:: ; 95741 (25:5741) +_OaksLabText27:: text $53, ": Alright" line "Gramps! Leave it" cont "all to me!" @@ -537,12 +353,12 @@ _OaksLabText27:: ; 95741 (25:5741) cont $52, "! Hahaha!" done -_OaksLabText_1d405:: ; 957eb (25:57eb) +_OaksLabText_1d405:: text "I study #MON as" line "PROF.OAK's AIDE." done -_OaksLabText_441cc:: ; 9580c (25:580c) +_OaksLabText_441cc:: text "#DEX comp-" line "letion is:" @@ -557,41 +373,41 @@ _OaksLabText_441cc:: ; 9580c (25:580c) line "Rating:" prompt -_OaksLabText_44201:: ; 95858 (25:5858) +_OaksLabText_44201:: text "You still have" line "lots to do." cont "Look for #MON" cont "in grassy areas!" done -_OaksLabText_44206:: ; 95893 (25:5893) +_OaksLabText_44206:: text "You're on the" line "right track! " cont "Get a FLASH HM" cont "from my AIDE!" done -_OaksLabText_4420b:: ; 958cc (25:58cc) +_OaksLabText_4420b:: text "You still need" line "more #MON!" cont "Try to catch" cont "other species!" done -_OaksLabText_44210:: ; 95903 (25:5903) +_OaksLabText_44210:: text "Good, you're" line "trying hard!" cont "Get an ITEMFINDER" cont "from my AIDE!" done -_OaksLabText_44215:: ; 9593d (25:593d) +_OaksLabText_44215:: text "Looking good!" line "Go find my AIDE" cont "when you get 50!" done -_OaksLabText_4421a:: ; 9596d (25:596d) +_OaksLabText_4421a:: text "You finally got at" line "least 50 species!" cont "Be sure to get" @@ -599,73 +415,64 @@ _OaksLabText_4421a:: ; 9596d (25:596d) cont "AIDE!" done -_OaksLabText_4421f:: ; 959b8 (25:59b8) -IF DEF(_YELLOW) - text "Oh! This is get-" - line "ting even better!" -ELSE +_OaksLabText_4421f:: text "Ho! This is geting" line "even better!" -ENDC done -_OaksLabText_44224:: ; 959d9 (25:59d9) +_OaksLabText_44224:: text "Very good!" line "Go fish for some" cont "marine #MON!" done -_OaksLabText_44229:: ; 95a03 (25:5a03) +_OaksLabText_44229:: text "Wonderful!" line "Do you like to" cont "collect things?" done -_OaksLabText_4422e:: ; 95a2e (25:5a2e) +_OaksLabText_4422e:: text "I'm impressed!" line "It must have been" cont "difficult to do!" done -_OaksLabText_44233:: ; 95a60 (25:5a60) +_OaksLabText_44233:: text "You finally got at" line "least 100 species!" cont "I can't believe" cont "how good you are!" done -_OaksLabText_44238:: ; 95aa8 (25:5aa8) +_OaksLabText_44238:: text "You even have the" line "evolved forms of" cont "#MON! Super!" done -_OaksLabText_4423d:: ; 95ad9 (25:5ad9) +_OaksLabText_4423d:: text "Excellent! Trade" line "with friends to" cont "get some more!" done -_OaksLabText_44242:: ; 95b0a (25:5b0a) +_OaksLabText_44242:: text "Outstanding!" line "You've become a" cont "real pro at this!" done -_OaksLabText_44247:: ; 95b39 (25:5b39) +_OaksLabText_44247:: text "I have nothing" line "left to say!" cont "You're the" cont "authority now!" done -_OaksLabText_4424c:: ; 95b6f (25:5b6f) +_OaksLabText_4424c:: text "Your #DEX is" -IF DEF(_YELLOW) - line "fully complete!" -ELSE line "entirely complete!" -ENDC cont "Congratulations!" done diff --git a/text/maps/pewter_city.asm b/text/maps/pewter_city.asm index 647832a3..0d7c7de7 100644 --- a/text/maps/pewter_city.asm +++ b/text/maps/pewter_city.asm @@ -1,4 +1,4 @@ -_PewterCityText1:: ; a497f (29:497f) +_PewterCityText1:: text "It's rumored that" line "CLEFAIRYs came" cont "from the moon!" @@ -8,7 +8,7 @@ _PewterCityText1:: ; a497f (29:497f) cont "fell on MT.MOON." done -_PewterCityText2:: ; a49e0 (29:49e0) +_PewterCityText2:: text "There aren't many" line "serious #MON" cont "trainers here!" @@ -20,24 +20,24 @@ _PewterCityText2:: ; a49e0 (29:49e0) cont "into it!" done -_PewterCityText_193f1:: ; a4a56 (29:4a56) +_PewterCityText_193f1:: text "Did you check out" line "the MUSEUM?" done -_PewterCityText_193f6:: ; a4a75 (29:4a75) +_PewterCityText_193f6:: text "Weren't those" line "fossils from MT." cont "MOON amazing?" done -_PewterCityText_193fb:: ; a4aa2 (29:4aa2) +_PewterCityText_193fb:: text "Really?" line "You absolutely" cont "have to go!" done -_PewterCityText13:: ; a4ac6 (29:4ac6) +_PewterCityText13:: text "It's right here!" line "You have to pay" cont "to get in, but" @@ -45,24 +45,24 @@ _PewterCityText13:: ; a4ac6 (29:4ac6) cont "See you around!" done -_PewterCityText_19427:: ; a4b14 (29:4b14) +_PewterCityText_19427:: text "Psssst!" line "Do you know what" cont "I'm doing?" done -_PewterCityText_1942c:: ; a4b38 (29:4b38) +_PewterCityText_1942c:: text "That's right!" line "It's hard work!" done -_PewterCityText_19431:: ; a4b55 (29:4b55) +_PewterCityText_19431:: text "I'm spraying REPEL" line "to keep #MON" cont "out of my garden!" done -_PewterCityText_1945d:: ; a4b87 (29:4b87) +_PewterCityText_1945d:: text "You're a trainer" line "right? BROCK's" cont "looking for new" @@ -70,13 +70,13 @@ _PewterCityText_1945d:: ; a4b87 (29:4b87) cont "Follow me!" done -_PewterCityText_19462:: ; a4bce (29:4bce) +_PewterCityText_19462:: text "If you have the" line "right stuff, go" cont "take on BROCK!" done -_PewterCityText6:: ; a4bfe (29:4bfe) +_PewterCityText6:: text "TRAINER TIPS" para "Any #MON that" @@ -85,7 +85,7 @@ _PewterCityText6:: ; a4bfe (29:4bfe) cont "short, earns EXP!" done -_PewterCityText7:: ; a4c4a (29:4c4a) +_PewterCityText7:: text "NOTICE!" para "Thieves have been" @@ -96,12 +96,12 @@ _PewterCityText7:: ; a4c4a (29:4c4a) cont "with any info!" done -_PewterCityText10:: ; a4cb1 (29:4cb1) +_PewterCityText10:: text "PEWTER MUSEUM" line "OF SCIENCE" done -_PewterCityText11:: ; a4ccb (29:4ccb) +_PewterCityText11:: text "PEWTER CITY" line "#MON GYM" cont "LEADER: BROCK" @@ -110,7 +110,7 @@ _PewterCityText11:: ; a4ccb (29:4ccb) line "#MON Trainer!" done -_PewterCityText12:: ; a4d0c (29:4d0c) +_PewterCityText12:: text "PEWTER CITY" line "A Stone Gray" cont "City" diff --git a/text/maps/pewter_gym_1.asm b/text/maps/pewter_gym_1.asm index 9f3a1213..1d56065b 100644 --- a/text/maps/pewter_gym_1.asm +++ b/text/maps/pewter_gym_1.asm @@ -1,4 +1,4 @@ -_PewterGymText_5c49e:: ; 9697a (25:697a) +_PewterGymText_5c49e:: text "I'm BROCK!" line "I'm PEWTER's GYM" cont "LEADER!" diff --git a/text/maps/pewter_gym_2.asm b/text/maps/pewter_gym_2.asm index 433fd649..ff5f7242 100644 --- a/text/maps/pewter_gym_2.asm +++ b/text/maps/pewter_gym_2.asm @@ -1,25 +1,8 @@ -_PewterGymText_5c4a3:: ; 98000 (26:4000) +_PewterGymText_5c4a3:: text "There are all" line "kinds of trainers" cont "in the world!" -IF DEF(_YELLOW) - para "Some raise #MON" - line "for fights. Some" - cont "see them as pets." - - para "I'm in training to" - line "become a #MON" - cont "breeder." - - para "If you take your" - line "#MON training" - cont "seriously, go" - cont "visit the GYM in" - cont "CERULEAN and test" - cont "your abilities!" - done -ELSE para "You appear to be" line "very gifted as a" cont "#MON trainer!" @@ -28,18 +11,17 @@ ELSE line "CERULEAN and test" cont "your abilities!" done -ENDC -_TM34PreReceiveText:: ; 98092 (26:4092) +_TM34PreReceiveText:: text "Wait! Take this" line "with you!" done -_ReceivedTM34Text:: ; 980ad (26:40ad) +_ReceivedTM34Text:: text $52, " received" line "TM34!@@" -_TM34ExplanationText:: ; 980c0 (26:40c0) +_TM34ExplanationText:: db $0 para "A TM contains a" line "technique that" @@ -62,12 +44,12 @@ _TM34ExplanationText:: ; 980c0 (26:40c0) cont "it back double!" done -_TM34NoRoomText:: ; 981ab (26:41ab) +_TM34NoRoomText:: text "You don't have" line "room for this!" done -_PewterGymText_5c4bc:: ; 981c9 (26:41c9) +_PewterGymText_5c4bc:: text "I took" line "you for granted." @@ -78,7 +60,7 @@ _PewterGymText_5c4bc:: ; 981c9 (26:41c9) para $52, " received" line "the BOULDERBADGE!@@" -_PewterGymText_5c4c1:: ; 98232 (26:4232) +_PewterGymText_5c4c1:: db $0 para "That's an official" line "#MON LEAGUE" @@ -90,14 +72,10 @@ _PewterGymText_5c4c1:: ; 98232 (26:4232) para "The technique" line "FLASH can now be" -IF DEF(_YELLOW) - cont "used anytime!" -ELSE cont "used any time!" -ENDC prompt -_PewterGymBattleText1:: ; 982ae (26:42ae) +_PewterGymBattleText1:: text "Stop right there," line "kid!" @@ -106,7 +84,7 @@ _PewterGymBattleText1:: ; 982ae (26:42ae) cont "BROCK!" done -_PewterGymEndBattleText1:: ; 982f1 (26:42f1) +_PewterGymEndBattleText1:: text "Darn!" para "Light years isn't" @@ -114,13 +92,13 @@ _PewterGymEndBattleText1:: ; 982f1 (26:42f1) cont "distance!" prompt -_PewterGymAfterBattleText1:: ; 98325 (26:4325) +_PewterGymAfterBattleText1:: text "You're pretty hot," line "but not as hot" cont "as BROCK!" done -_PewterGymText_5c515:: ; 98351 (26:4351) +_PewterGymText_5c515:: text "Hiya! I can tell" line "you have what it" cont "takes to become a" @@ -134,12 +112,12 @@ _PewterGymText_5c515:: ; 98351 (26:4351) line "to the top!" done -_PewterGymText_5c51a:: ; 983dc (26:43dc) +_PewterGymText_5c51a:: text "All right! Let's" line "get happening!" prompt -_PewterGymText_5c51f:: ; 983fc (26:43fc) +_PewterGymText_5c51f:: text "The 1st #MON" line "out in a match is" cont "at the top of the" @@ -151,30 +129,14 @@ _PewterGymText_5c51f:: ; 983fc (26:43fc) cont "made easier!" done -_PewterGymText_5c524:: ; 98476 (26:4476) +_PewterGymText_5c524:: text "It's a free" line "service! Let's" cont "get happening!" prompt -_PewterGymText_5c529:: ; 9849f (26:449f) +_PewterGymText_5c529:: text "Just as I thought!" line "You're #MON" cont "champ material!" done - -IF DEF(_YELLOW) -_PewterGymGuyText:: - text "All right! Let's" - line "get happening!" - - para "It will be tough" - line "for your PIKACHU" - cont "at this GYM!" - - para "Electric attacks" - line "are harmless to" - cont "BROCK's ground-" - cont "type #MON." - done -ENDC diff --git a/text/maps/pewter_house_1.asm b/text/maps/pewter_house_1.asm index fa5ff179..0fe3e165 100644 --- a/text/maps/pewter_house_1.asm +++ b/text/maps/pewter_house_1.asm @@ -1,11 +1,11 @@ -_PewterHouse1Text1:: ; 984ce (26:44ce) +_PewterHouse1Text1:: text "NIDORAN: Bowbow!@@" -_PewterHouse1Text2:: ; 984e1 (26:44e1) +_PewterHouse1Text2:: text "NIDORAN sit!" done -_PewterHouse1Text3:: ; 984ef (26:44ef) +_PewterHouse1Text3:: text "Our #MON's an" line "outsider, so it's" cont "hard to handle." diff --git a/text/maps/pewter_house_2.asm b/text/maps/pewter_house_2.asm index 1e7b1cd6..34ebc90d 100644 --- a/text/maps/pewter_house_2.asm +++ b/text/maps/pewter_house_2.asm @@ -1,4 +1,4 @@ -_PewterHouse2Text1:: ; 98656 (26:4656) +_PewterHouse2Text1:: text "#MON learn new" line "techniques as" cont "they grow!" @@ -8,7 +8,7 @@ _PewterHouse2Text1:: ; 98656 (26:4656) cont "the trainer!" done -_PewterHouse2Text2:: ; 986ae (26:46ae) +_PewterHouse2Text2:: text "#MON become" line "easier to catch" cont "when they are" diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm index 71760b7b..bac57a53 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/pewter_mart.asm @@ -1,9 +1,5 @@ -_PewterMartText_74cc6:: ; 985ac (26:45ac) -IF DEF(_YELLOW) - text "A shady old man" -ELSE +_PewterMartText_74cc6:: text "A shady, old man" -ENDC line "got me to buy" cont "this really weird" cont "fish #MON!" @@ -12,7 +8,7 @@ ENDC line "and it cost ¥500!" done -_PewterMartText_74cd5:: ; 9860c (26:460c) +_PewterMartText_74cd5:: text "Good things can" line "happen if you" cont "raise #MON" diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/pewter_pokecenter.asm index 114fed16..2df5c715 100644 --- a/text/maps/pewter_pokecenter.asm +++ b/text/maps/pewter_pokecenter.asm @@ -1,4 +1,4 @@ -_PewterPokecenterText1:: ; 98704 (26:4704) +_PewterPokecenterText1:: text "What!?" para "TEAM ROCKET is" @@ -8,22 +8,7 @@ _PewterPokecenterText1:: ; 98704 (26:4704) para "Scram!" done -IF DEF(_YELLOW) -_PewterPokecenterText2:: - text "#MON CENTERS" - line "are wonderful!" - - para "They heal #MON" - line "completely." - - para "Even conditions" - line "like sleep, burn," - cont "poison and others" - cont "are cured." - done -ENDC - -_PewterPokecenterText5:: ; 98744 (26:4744) +_PewterPokecenterText5:: text "JIGGLYPUFF: Puu" line "pupuu!" done diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/pokemon_league_gate.asm index cadfea3b..b817ef81 100644 --- a/text/maps/pokemon_league_gate.asm +++ b/text/maps/pokemon_league_gate.asm @@ -1,4 +1,4 @@ -_Route22GateText_1e704:: ; 8cfbb (23:4fbb) +_Route22GateText_1e704:: text "Only truly skilled" line "trainers are" cont "allowed through." @@ -6,14 +6,14 @@ _Route22GateText_1e704:: ; 8cfbb (23:4fbb) para "You don't have the" line "BOULDERBADGE yet!@@" -_Route22GateText_1e715:: ; 8d012 (23:5012) +_Route22GateText_1e715:: db $0 para "The rules are" line "rules. I can't" cont "let you pass." done -_Route22GateText_1e71a:: ; 8d03e (23:503e) +_Route22GateText_1e71a:: text "Oh! That is the" line "BOULDERBADGE!" cont "Go right ahead!@@" diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/pokemon_tower_1f.asm index 124888c0..b9570d18 100644 --- a/text/maps/pokemon_tower_1f.asm +++ b/text/maps/pokemon_tower_1f.asm @@ -1,17 +1,17 @@ -_PokemonTower1Text1:: ; 9947f (26:547f) +_PokemonTower1Text1:: text "#MON TOWER was" line "erected in the" cont "memory of #MON" cont "that had died." done -_PokemonTower1Text2:: ; 994bc (26:54bc) +_PokemonTower1Text2:: text "Did you come to" line "pay respects?" cont "Bless you!" done -_PokemonTower1Text3:: ; 994e6 (26:54e6) +_PokemonTower1Text3:: text "I came to pray" line "for my CLEFAIRY." @@ -19,12 +19,12 @@ _PokemonTower1Text3:: ; 994e6 (26:54e6) line "stop crying..." done -_PokemonTower1Text4:: ; 99524 (26:5524) +_PokemonTower1Text4:: text "My GROWLITHE..." line "Why did you die?" done -_PokemonTower1Text5:: ; 99546 (26:5546) +_PokemonTower1Text5:: text "I am a CHANNELER!" line "There are spirits" cont "up to mischief!" diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm index 6a33e085..e41112a4 100644 --- a/text/maps/pokemon_tower_2f.asm +++ b/text/maps/pokemon_tower_2f.asm @@ -1,4 +1,4 @@ -_PokemonTower2Text_6062d:: ; 9957b (26:557b) +_PokemonTower2Text_6062d:: text $53, ": Hey," line $52, "! What" cont "brings you here?" @@ -10,7 +10,7 @@ _PokemonTower2Text_6062d:: ; 9957b (26:557b) cont "Let's go, pal!" done -_PokemonTower2Text_60632:: ; 995e5 (26:55e5) +_PokemonTower2Text_60632:: text "What?" line "You stinker!" @@ -18,7 +18,7 @@ _PokemonTower2Text_60632:: ; 995e5 (26:55e5) line "you too!" prompt -_PokemonTower2Text_60637:: ; 99614 (26:5614) +_PokemonTower2Text_60637:: text $53, ": Well," line "look at all your" cont "wimpy #MON!" @@ -27,7 +27,7 @@ _PokemonTower2Text_60637:: ; 99614 (26:5614) line "bit more!" prompt -_PokemonTower2Text_6063c:: ; 99657 (26:5657) +_PokemonTower2Text_6063c:: text "How's your #DEX" line "coming, pal?" cont "I just caught a" @@ -46,7 +46,7 @@ _PokemonTower2Text_6063c:: ; 99657 (26:5657) para "Smell ya later!" done -_PokemonTower2Text2:: ; 9971a (26:571a) +_PokemonTower2Text2:: text "Even we could not" line "identify the" cont "wayward GHOSTs!" diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/pokemon_tower_3f.asm index 267d8ab6..443aecd5 100644 --- a/text/maps/pokemon_tower_3f.asm +++ b/text/maps/pokemon_tower_3f.asm @@ -1,45 +1,45 @@ -_PokemonTower3BattleText1:: ; 99776 (26:5776) +_PokemonTower3BattleText1:: text "Urrg...Awaa..." line "Huhu...graa.." done -_PokemonTower3EndBattleText1:: ; 99794 (26:5794) +_PokemonTower3EndBattleText1:: text "Hwa!" line "I'm saved!" prompt -_PokemonTower3AfterBattleText1:: ; 997a4 (26:57a4) +_PokemonTower3AfterBattleText1:: text "The GHOSTs can be" line "identified by the" cont "SILPH SCOPE." done -_PokemonTower3BattleText2:: ; 997d6 (26:57d6) +_PokemonTower3BattleText2:: text "Kekeke...." line "Kwaaah!" done -_PokemonTower3EndBattleText2:: ; 997ea (26:57ea) +_PokemonTower3EndBattleText2:: text "Hmm?" line "What am I doing?" prompt -_PokemonTower3AfterBattleText2:: ; 99801 (26:5801) +_PokemonTower3AfterBattleText2:: text "Sorry! I was" line "possessed!" done -_PokemonTower3BattleText3:: ; 9981a (26:581a) +_PokemonTower3BattleText3:: text "Be gone!" line "Evil spirit!" done -_PokemonTower3EndBattleText3:: ; 99831 (26:5831) +_PokemonTower3EndBattleText3:: text "Whew!" line "The spirit left!" prompt -_PokemonTower3AfterBattleText3:: ; 99849 (26:5849) +_PokemonTower3AfterBattleText3:: text "My friends were" line "possessed too!" done diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/pokemon_tower_4f.asm index cde92b0c..e8fa75b6 100644 --- a/text/maps/pokemon_tower_4f.asm +++ b/text/maps/pokemon_tower_4f.asm @@ -1,44 +1,44 @@ -_PokemonTower4BattleText1:: ; 99869 (26:5869) +_PokemonTower4BattleText1:: text "GHOST! No!" line "Kwaaah!" done -_PokemonTower4EndBattleText1:: ; 9987d (26:587d) +_PokemonTower4EndBattleText1:: text "Where" line "is the GHOST?" prompt -_PokemonTower4AfterBattleText1:: ; 99892 (26:5892) +_PokemonTower4AfterBattleText1:: text "I must have been" line "dreaming..." done -_PokemonTower4BattleText2:: ; 998b0 (26:58b0) +_PokemonTower4BattleText2:: text "Be cursed with" line "me! Kwaaah!" done -_PokemonTower4EndBattleText2:: ; 998cc (26:58cc) +_PokemonTower4EndBattleText2:: text "What!" prompt -_PokemonTower4AfterBattleText2:: ; 998d3 (26:58d3) +_PokemonTower4AfterBattleText2:: text "We can't crack" line "the identity of" cont "the GHOSTs." done -_PokemonTower4BattleText3:: ; 998fe (26:58fe) +_PokemonTower4BattleText3:: text "Huhuhu..." line "Beat me not!" done -_PokemonTower4EndBattleText3:: ; 99916 (26:5916) +_PokemonTower4EndBattleText3:: text "Huh?" line "Who? What?" prompt -_PokemonTower4AfterBattleText3:: ; 99927 (26:5927) +_PokemonTower4AfterBattleText3:: text "May the departed" line "souls of #MON" cont "rest in peace..." diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/pokemon_tower_5f.asm index 95ce2f4b..bbdc3d84 100644 --- a/text/maps/pokemon_tower_5f.asm +++ b/text/maps/pokemon_tower_5f.asm @@ -1,4 +1,4 @@ -_PokemonTower5Text1:: ; 99958 (26:5958) +_PokemonTower5Text1:: text "Come, child! I" line "sealed this space" cont "with white magic!" @@ -6,63 +6,63 @@ _PokemonTower5Text1:: ; 99958 (26:5958) para "You can rest here!" done -_PokemonTower5BattleText1:: ; 9999f (26:599f) +_PokemonTower5BattleText1:: text "Give...me..." line "your...soul..." done -_PokemonTower5EndBattleText1:: ; 999bc (26:59bc) +_PokemonTower5EndBattleText1:: text "Gasp!" prompt -_PokemonTower5AfterBattleText1:: ; 999c3 (26:59c3) +_PokemonTower5AfterBattleText1:: text "I was under" line "possession!" done -_PokemonTower5BattleText2:: ; 999dc (26:59dc) +_PokemonTower5BattleText2:: text "You...shall..." line "join...us..." done -_PokemonTower5EndBattleText2:: ; 999f9 (26:59f9) +_PokemonTower5EndBattleText2:: text "What" line "a nightmare!" prompt -_PokemonTower5AfterBattleText2:: ; 99a0c (26:5a0c) +_PokemonTower5AfterBattleText2:: text "I was possessed!" done -_PokemonTower5BattleText3:: ; 99a1e (26:5a1e) +_PokemonTower5BattleText3:: text "Zombies!" done -_PokemonTower5EndBattleText3:: ; 99a28 (26:5a28) +_PokemonTower5EndBattleText3:: text "Ha?" prompt -_PokemonTower5AfterBattleText3:: ; 99a2d (26:5a2d) +_PokemonTower5AfterBattleText3:: text "I regained my" line "senses!" done -_PokemonTower5BattleText4:: ; 99a44 (26:5a44) +_PokemonTower5BattleText4:: text "Urgah..." line "Urff...." done -_PokemonTower5EndBattleText4:: ; 99a57 (26:5a57) +_PokemonTower5EndBattleText4:: text "Whoo!" prompt -_PokemonTower5AfterBattleText4:: ; 99a5e (26:5a5e) +_PokemonTower5AfterBattleText4:: text "I fell to evil" line "spirits despite" cont "my training!" done -_PokemonTower5Text7:: ; 99a8b (26:5a8b) +_PokemonTower5Text7:: text "Entered purified," line "protected zone!" diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/pokemon_tower_6f.asm index 08eb6b1a..ff8bc73c 100644 --- a/text/maps/pokemon_tower_6f.asm +++ b/text/maps/pokemon_tower_6f.asm @@ -1,10 +1,10 @@ -_PokemonTower2Text_60c1f:: ; 99ac8 (26:5ac8) +_PokemonTower2Text_60c1f:: text "The GHOST was the" line "restless soul of" cont "CUBONE's mother!" done -_PokemonTower2Text_60c24:: ; 99afc (26:5afc) +_PokemonTower2Text_60c24:: text "The mother's soul" line "was calmed." @@ -12,50 +12,50 @@ _PokemonTower2Text_60c24:: ; 99afc (26:5afc) line "the afterlife!" done -_PokemonTower6BattleText1:: ; 99b38 (26:5b38) +_PokemonTower6BattleText1:: text "Give...me..." line "blood..." done -_PokemonTower6EndBattleText1:: ; 99b4f (26:5b4f) +_PokemonTower6EndBattleText1:: text "Groan!" prompt -_PokemonTower6AfterBattleText1:: ; 99b57 (26:5b57) +_PokemonTower6AfterBattleText1:: text "I feel anemic and" line "weak..." done -_PokemonTower6BattleText2:: ; 99b72 (26:5b72) +_PokemonTower6BattleText2:: text "Urff... Kwaah!" done -_PokemonTower6EndBattleText2:: ; 99b82 (26:5b82) +_PokemonTower6EndBattleText2:: text "Some-" line "thing fell out!" prompt -_PokemonTower6AfterBattleText2:: ; 99b99 (26:5b99) +_PokemonTower6AfterBattleText2:: text "Hair didn't fall" line "out! It was an" cont "evil spirit!" done -_PokemonTower6BattleText3:: ; 99bc6 (26:5bc6) +_PokemonTower6BattleText3:: text "Ke..ke...ke..." line "ke..ke...ke!!" done -_PokemonTower6EndBattleText3:: ; 99be4 (26:5be4) +_PokemonTower6EndBattleText3:: text "Keee!" prompt -_PokemonTower6AfterBattleText3:: ; 99beb (26:5beb) +_PokemonTower6AfterBattleText3:: text "What's going on" line "here?" done -_PokemonTower6Text6:: ; 99c01 (26:5c01) +_PokemonTower6Text6:: text "Be gone..." line "Intruders..." done diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm index 2c1449b1..704a71eb 100644 --- a/text/maps/pokemon_tower_7f.asm +++ b/text/maps/pokemon_tower_7f.asm @@ -1,30 +1,4 @@ -IF DEF(_YELLOW) -_PokemonTowerJessieJamesText1:: - text "Stop right there!@@" - -_PokemonTowerJessieJamesText2:: - text "Grampa here wanted" - line "to complain, so" - cont "we're setting him" - cont "straight." - - para "So render yourself" - line "invisible, or" - cont "prepare to fight!" - done - -_PokemonTowerJessieJamesText3:: - text "You" - line "will regret this!" - prompt - -_PokemonTowerJessieJamesText4:: - text "Looks like TEAM" - line "ROCKET's blasting" - cont "off again!@@" -ENDC - -_TowerRescueFujiText:: ; 99c1a (26:5c1a) +_TowerRescueFujiText:: text "MR.FUJI: Heh? You" line "came to save me?" @@ -50,21 +24,21 @@ _TowerRescueFujiText:: ; 99c1a (26:5c1a) cont "of this tower." done -_PokemonTower7BattleText1:: ; 99d31 (26:5d31) +_PokemonTower7BattleText1:: text "What do you want?" line "Why are you here?" done -_PokemonTower7EndBattleText1:: ; 99d56 (26:5d56) +_PokemonTower7EndBattleText1:: text "I give up!" prompt -_PokemonTower7AfterBattleText1:: ; 99d62 (26:5d62) +_PokemonTower7AfterBattleText1:: text "I'm not going to" line "forget this!" done -_PokemonTower7BattleText2:: ; 99d80 (26:5d80) +_PokemonTower7BattleText2:: text "This old guy came" line "and complained" cont "about us harming" @@ -74,12 +48,12 @@ _PokemonTower7BattleText2:: ; 99d80 (26:5d80) line "over as adults!" done -_PokemonTower7EndBattleText2:: ; 99de1 (26:5de1) +_PokemonTower7EndBattleText2:: text "Please!" line "No more!" prompt -_PokemonTower7AfterBattleText2:: ; 99df3 (26:5df3) +_PokemonTower7AfterBattleText2:: text "#MON are only" line "good for making" cont "money!" @@ -88,18 +62,17 @@ _PokemonTower7AfterBattleText2:: ; 99df3 (26:5df3) line "business!" done -_PokemonTower7BattleText3:: ; 99e33 (26:5e33) +_PokemonTower7BattleText3:: text "You're not saving" line "anyone, kid!" done -_PokemonTower7EndBattleText3:: ; 99e52 (26:5e52) +_PokemonTower7EndBattleText3:: text "Don't" line "fight us ROCKETs!" prompt -_PokemonTower7AfterBattleText3:: ; 99e6a (26:5e6a) +_PokemonTower7AfterBattleText3:: text "You're not getting" line "away with this!" done - diff --git a/text/maps/power_plant.asm b/text/maps/power_plant.asm index 477bf60a..2ea387d7 100644 --- a/text/maps/power_plant.asm +++ b/text/maps/power_plant.asm @@ -1,7 +1,7 @@ -_VoltorbBattleText:: ; 8c5e2 (23:45e2) +_VoltorbBattleText:: text "Bzzzt!" done -_ZapdosBattleText:: ; 8c5ea (23:45ea) +_ZapdosBattleText:: text "Gyaoo!@@" diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index 16cf5129..729c5b46 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -1,11 +1,7 @@ _MomWakeUpText:: text "MOM: Right." line "All boys leave" -IF DEF(_YELLOW) - cont "home someday." -ELSE cont "home some day." -ENDC cont "It said so on TV." para "PROF.OAK, next" @@ -14,22 +10,10 @@ ENDC done _MomHealText1:: -IF DEF(_YELLOW) - text "MOM: ",$52,", if" - line "your drive your" - cont "#MON too hard," - cont "they'll dislike" - cont "you." - - para "You should take a" - line "rest." - prompt -ELSE text "MOM: ",$52,"!" line "You should take a" cont "quick rest." prompt -ENDC _MomHealText2:: text "MOM: Oh good!" diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/rock_tunnel_b1f.asm index 4ad2b255..88659e8e 100644 --- a/text/maps/rock_tunnel_b1f.asm +++ b/text/maps/rock_tunnel_b1f.asm @@ -1,114 +1,114 @@ -_RockTunnel1BattleText1:: ; 8c33a (23:433a) +_RockTunnel1BattleText1:: text "This tunnel goes" line "a long way, kid!" done -_RockTunnel1EndBattleText1:: ; 8c35d (23:435d) +_RockTunnel1EndBattleText1:: text "Doh!" line "You win!" prompt -_RockTunnel1AfterBattleText1:: ; 8c36c (23:436c) +_RockTunnel1AfterBattleText1:: text "Watch for ONIX!" line "It can put the" cont "squeeze on you!" done -_RockTunnel1BattleText2:: ; 8c39c (23:439c) +_RockTunnel1BattleText2:: text "Hmm. Maybe I'm" line "lost in here..." done -_RockTunnel1EndBattleText2:: ; 8c3bb (23:43bb) +_RockTunnel1EndBattleText2:: text "Ease up!" line "What am I doing?" cont "Which way is out?" prompt -_RockTunnel1AfterBattleText2:: ; 8c3e8 (23:43e8) +_RockTunnel1AfterBattleText2:: text "That sleeping" line "#MON on ROUTE" cont "12 forced me to" cont "take this detour." done -_RockTunnel1BattleText3:: ; 8c427 (23:4427) +_RockTunnel1BattleText3:: text "Outsiders like" line "you need to show" cont "me some respect!" done -_RockTunnel1EndBattleText3:: ; 8c459 (23:4459) +_RockTunnel1EndBattleText3:: text "I give!" prompt -_RockTunnel1AfterBattleText3:: ; 8c462 (23:4462) +_RockTunnel1AfterBattleText3:: text "You're talented" line "enough to hike!" done -_RockTunnel1BattleText4:: ; 8c482 (23:4482) +_RockTunnel1BattleText4:: text "#MON fight!" line "Ready, go!" done -_RockTunnel1EndBattleText4:: ; 8c49a (23:449a) +_RockTunnel1EndBattleText4:: text "Game" line "over!" prompt -_RockTunnel1AfterBattleText4:: ; 8c4a6 (23:44a6) +_RockTunnel1AfterBattleText4:: text "Oh well, I'll get" line "a ZUBAT as I go!" done -_RockTunnel1BattleText5:: ; 8c4c9 (23:44c9) +_RockTunnel1BattleText5:: text "Eek! Don't try" line "anything funny in" cont "the dark!" done -_RockTunnel1EndBattleText5:: ; 8c4f4 (23:44f4) +_RockTunnel1EndBattleText5:: text "It" line "was too dark!" prompt -_RockTunnel1AfterBattleText5:: ; 8c506 (23:4506) +_RockTunnel1AfterBattleText5:: text "I saw a MACHOP" line "in this tunnel!" done -_RockTunnel1BattleText6:: ; 8c526 (23:4526) +_RockTunnel1BattleText6:: text "I came this far" line "for #MON!" done -_RockTunnel1EndBattleText6:: ; 8c541 (23:4541) +_RockTunnel1EndBattleText6:: text "I'm" line "out of #MON!" prompt -_RockTunnel1AfterBattleText6:: ; 8c552 (23:4552) +_RockTunnel1AfterBattleText6:: text "You looked cute" line "and harmless!" done -_RockTunnel1BattleText7:: ; 8c571 (23:4571) +_RockTunnel1BattleText7:: text "You have #MON!" line "Let's start!" done -_RockTunnel1EndBattleText7:: ; 8c58d (23:458d) +_RockTunnel1EndBattleText7:: text "You" line "play hard!" prompt -_RockTunnel1AfterBattleText7:: ; 8c59d (23:459d) +_RockTunnel1AfterBattleText7:: text "Whew! I'm all" line "sweaty now!" done -_RockTunnel1Text8:: ; 8c5b7 (23:45b7) +_RockTunnel1Text8:: text "ROCK TUNNEL" line "CERULEAN CITY -" cont "LAVENDER TOWN" diff --git a/text/maps/rock_tunnel_b2f_1.asm b/text/maps/rock_tunnel_b2f_1.asm index 47dc2bb9..e859a7f9 100644 --- a/text/maps/rock_tunnel_b2f_1.asm +++ b/text/maps/rock_tunnel_b2f_1.asm @@ -1,108 +1,108 @@ -_RockTunnel2BattleText2:: ; 86a1d (21:6a1d) +_RockTunnel2BattleText2:: text "Hikers leave twigs" line "as trail markers." done -_RockTunnel2EndBattleText2:: ; 86a43 (21:6a43) +_RockTunnel2EndBattleText2:: text "Ohhh!" line "I did my best!" prompt -_RockTunnel2AfterBattleText2:: ; 86a59 (21:6a59) +_RockTunnel2AfterBattleText2:: text "I want to go " line "home!" done -_RockTunnel2BattleText3:: ; 86a6e (21:6a6e) +_RockTunnel2BattleText3:: text "Hahaha! Can you" line "beat my power?" done -_RockTunnel2EndBattleText3:: ; 86a8e (21:6a8e) +_RockTunnel2EndBattleText3:: text "Oops!" line "Out-muscled!" prompt -_RockTunnel2AfterBattleText3:: ; 86aa2 (21:6aa2) +_RockTunnel2AfterBattleText3:: text "I go for power" line "because I hate" cont "thinking!" done -_RockTunnel2BattleText4:: ; 86acb (21:6acb) +_RockTunnel2BattleText4:: text "You have a" line "#DEX?" cont "I want one too!" done -_RockTunnel2EndBattleText4:: ; 86aed (21:6aed) +_RockTunnel2EndBattleText4:: text "Shoot!" line "I'm so jealous!" prompt -_RockTunnel2AfterBattleText4:: ; 86b04 (21:6b04) +_RockTunnel2AfterBattleText4:: text "When you finish" line "your #DEX, can" cont "I have it?" done -_RockTunnel2BattleText5:: ; 86b2f (21:6b2f) +_RockTunnel2BattleText5:: text "Do you know about" line "costume players?" done -_RockTunnel2EndBattleText5:: ; 86b53 (21:6b53) +_RockTunnel2EndBattleText5:: text "Well," line "that's that." prompt -_RockTunnel2AfterBattleText5:: ; 86b66 (21:6b66) +_RockTunnel2AfterBattleText5:: text "Costume players" line "dress up as" cont "#MON for fun." done -_RockTunnel2BattleText6:: ; 86b91 (21:6b91) +_RockTunnel2BattleText6:: text "My #MON" line "techniques will" cont "leave you crying!" done -_RockTunnel2EndBattleText6:: ; 86bbc (21:6bbc) +_RockTunnel2EndBattleText6:: text "I give!" line "You're a better" cont "technician!" prompt -_RockTunnel2AfterBattleText6:: ; 86be0 (21:6be0) +_RockTunnel2AfterBattleText6:: text "In mountains," line "you'll often find" cont "rock-type #MON." done -_RockTunnel2BattleText7:: ; 86c10 (21:6c10) +_RockTunnel2BattleText7:: text "I don't often" line "come here, but I" cont "will fight you." done -_RockTunnel2EndBattleText7:: ; 86c3f (21:6c3f) +_RockTunnel2EndBattleText7:: text "Oh!" line "I lost!" prompt -_RockTunnel2AfterBattleText7:: ; 86c4c (21:6c4c) +_RockTunnel2AfterBattleText7:: text "I like tiny" line "#MON, big ones" cont "are too scary!" done -_RockTunnel2BattleText8:: ; 86c77 (21:6c77) +_RockTunnel2BattleText8:: text "Hit me with your" line "best shot!" done -_RockTunnel2EndBattleText8:: ; 86c94 (21:6c94) +_RockTunnel2EndBattleText8:: text "Fired" line "away!" prompt diff --git a/text/maps/rock_tunnel_b2f_2.asm b/text/maps/rock_tunnel_b2f_2.asm index e76cdaaf..646ccd02 100644 --- a/text/maps/rock_tunnel_b2f_2.asm +++ b/text/maps/rock_tunnel_b2f_2.asm @@ -1,20 +1,20 @@ -_RockTunnel2AfterBattleText8:: ; 88000 (22:4000) +_RockTunnel2AfterBattleText8:: text "I'll raise my" line "#MON to beat" cont "yours, kid!" done -_RockTunnel2BattleText9:: ; 88027 (22:4027) +_RockTunnel2BattleText9:: text "I draw #MON" line "when I'm home." done -_RockTunnel2EndBattleText9:: ; 88042 (22:4042) +_RockTunnel2EndBattleText9:: text "Whew!" line "I'm exhausted!" prompt -_RockTunnel2AfterBattleText9:: ; 88057 (22:4057) +_RockTunnel2AfterBattleText9:: text "I'm an artist," line "not a fighter." done diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/rock_tunnel_pokecenter.asm index 715031ff..a5268dd2 100644 --- a/text/maps/rock_tunnel_pokecenter.asm +++ b/text/maps/rock_tunnel_pokecenter.asm @@ -1,4 +1,4 @@ -_RockTunnelPokecenterText1:: ; 8c2c0 (23:42c0) +_RockTunnelPokecenterText1:: text "The element types" line "of #MON make" cont "them stronger" @@ -7,7 +7,7 @@ _RockTunnelPokecenterText1:: ; 8c2c0 (23:42c0) cont "others!" done -_RockTunnelPokecenterText3:: ; 8c316 (23:4316) +_RockTunnelPokecenterText3:: text "I sold a useless" line "NUGGET for ¥5000!" done diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/rocket_hideout_b1f.asm index bb75bb08..66ac1fbd 100644 --- a/text/maps/rocket_hideout_b1f.asm +++ b/text/maps/rocket_hideout_b1f.asm @@ -1,73 +1,73 @@ -_RocketHideout1EndBattleText6:: ; 81f2a (20:5f2a) +_RocketHideout1EndBattleText6:: text "Why...?@@" -_RocketHideout1BattleText2:: ; 81f34 (20:5f34) +_RocketHideout1BattleText2:: text "Who are you? How" line "did you get here?" done -_RocketHideout1EndBattleText2:: ; 81f58 (20:5f58) +_RocketHideout1EndBattleText2:: text "Oww!" line "Beaten!" prompt -_RocketHideout1AfterBattleTxt2:: ; 81f66 (20:5f66) +_RocketHideout1AfterBattleTxt2:: text "Are you dissing" line "TEAM ROCKET?" done -_RocketHideout1BattleText3:: ; 81f84 (20:5f84) +_RocketHideout1BattleText3:: text "You broke into" line "our operation?" done -_RocketHideout1EndBattleText3:: ; 81fa3 (20:5fa3) +_RocketHideout1EndBattleText3:: text "Burnt!" prompt -_RocketHideout1AfterBattleTxt3:: ; 81fab (20:5fab) +_RocketHideout1AfterBattleTxt3:: text "You're not going" line "to get away with" cont "this, brat!" done -_RocketHideout1BattleText4:: ; 81fd9 (20:5fd9) +_RocketHideout1BattleText4:: text "Intruder alert!" done -_RocketHideout1EndBattleText4:: ; 81fea (20:5fea) +_RocketHideout1EndBattleText4:: text "I" line "can't do it!" prompt -_RocketHideout1AfterBattleTxt4:: ; 81ff9 (20:5ff9) +_RocketHideout1AfterBattleTxt4:: text "SILPH SCOPE?" line "I don't know" cont "where it is!" done -_RocketHideout1BattleText5:: ; 82020 (20:6020) +_RocketHideout1BattleText5:: text "Why did you come" line "here?" done -_RocketHideout1EndBattleText5:: ; 82038 (20:6038) +_RocketHideout1EndBattleText5:: text "This" line "won't do!" prompt -_RocketHideout1AfterBattleTxt5:: ; 82047 (20:6047) +_RocketHideout1AfterBattleTxt5:: text "OK, I'll talk!" line "Take the elevator" cont "to see my BOSS!" done -_RocketHideout1BattleText6:: ; 82078 (20:6078) +_RocketHideout1BattleText6:: text "Are you lost, you" line "little rat?" done -_RocketHideout1AfterBattleTxt6:: ; 82097 (20:6097) +_RocketHideout1AfterBattleTxt6:: text "Uh-oh, that fight" line "opened the door!" done diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/rocket_hideout_b2f.asm index abbdf646..1b0e9439 100644 --- a/text/maps/rocket_hideout_b2f.asm +++ b/text/maps/rocket_hideout_b2f.asm @@ -1,15 +1,15 @@ -_RocketHideout2BattleText2:: ; 820bb (20:60bb) +_RocketHideout2BattleText2:: text "BOSS said you can" line "see GHOSTs with" cont "the SILPH SCOPE!" done -_RocketHideout2EndBattleText2:: ; 820ef (20:60ef) +_RocketHideout2EndBattleText2:: text "I" line "surrender!" prompt -_RocketHideout2AfterBattleTxt2:: ; 820fd (20:60fd) +_RocketHideout2AfterBattleTxt2:: text "The TEAM ROCKET" line "HQ has 4 basement" cont "floors. Can you" diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/rocket_hideout_b3f.asm index 78f0656b..67bc9c24 100644 --- a/text/maps/rocket_hideout_b3f.asm +++ b/text/maps/rocket_hideout_b3f.asm @@ -1,33 +1,33 @@ -_RocketHideout3BattleText2:: ; 82140 (20:6140) +_RocketHideout3BattleText2:: text "Stop meddling in" line "TEAM ROCKET's" cont "affairs!" done -_RocketHideout3EndBattleText2:: ; 82168 (20:6168) +_RocketHideout3EndBattleText2:: text "Oof!" line "Taken down!" prompt -_RocketHideout3AfterBattleTxt2:: ; 8217a (20:617a) +_RocketHideout3AfterBattleTxt2:: text "SILPH SCOPE?" line "The machine the" cont "BOSS stole. It's" cont "here somewhere." done -_RocketHideout3BattleTxt:: ; 821b8 (20:61b8) +_RocketHideout3BattleTxt:: text "We got word from" line "upstairs that you" cont "were coming!" done -_RocketHideout3EndBattleText3:: ; 821e9 (20:61e9) +_RocketHideout3EndBattleText3:: text "What?" line "I lost? No!" prompt -_RocketHide3AfterBattleText3:: ; 821fc (20:61fc) +_RocketHide3AfterBattleText3:: text "Go ahead and go!" line "But, you need the" cont "LIFT KEY to run" diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm index e069e4a9..6d84305a 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/rocket_hideout_b4f.asm @@ -1,40 +1,15 @@ -IF DEF(_YELLOW) -_RocketHideoutJessieJamesText1:: - text "Not another step," - line "brat!@@" - -_RocketHideoutJessieJamesText2:: - text "How dare you" - line "humiliate us at" - cont "MT.MOON!" - - para "It's payback time," - line "you brat!" - done - -_RocketHideoutJessieJamesText3:: - text "Such" - line "a dreadful twerp!" - prompt - -_RocketHideoutJessieJamesText4:: - text "Looks like TEAM" - line "ROCKET's blasting" - cont "off again!@@" -ENDC - -_RocketHideout4Text_4557a:: ; 8223e (20:623e) +_RocketHideout4Text_4557a:: text "So! I must say, I" line "am impressed you" cont "got here!" done -_RocketHideout4Text_4557f:: ; 8226c (20:626c) +_RocketHideout4Text_4557f:: text "WHAT!" line "This cannot be!" prompt -_RocketHideout4Text_45584:: ; 82283 (20:6283) +_RocketHideout4Text_45584:: text "I see that you" line "raise #MON" cont "with utmost care." @@ -51,49 +26,49 @@ _RocketHideout4Text_45584:: ; 82283 (20:6283) line "again..." done -_RocketHideout4BattleText2:: ; 82326 (20:6326) +_RocketHideout4BattleText2:: text "I know you! You" line "ruined our plans" cont "at MT.MOON!" done -_RocketHideout4EndBattleText2:: ; 82354 (20:6354) +_RocketHideout4EndBattleText2:: text "Burned" line "again!" prompt -_RocketHide4AfterBattleText2:: ; 82363 (20:6363) +_RocketHide4AfterBattleText2:: text "Do you have" line "something against" cont "TEAM ROCKET?" done -_RocketHideout4BattleText3:: ; 8238f (20:638f) +_RocketHideout4BattleText3:: text "How can you not" line "see the beauty of" cont "our evil?" done -_RocketHideout4EndBattleText3:: ; 823bc (20:63bc) +_RocketHideout4EndBattleText3:: text "Ayaya!" prompt -_RocketHide4AfterBattleText3:: ; 823c4 (20:63c4) +_RocketHide4AfterBattleText3:: text "BOSS! I'm sorry I" line "failed you!" done -_RocketHideout4BattleText4:: ; 823e2 (20:63e2) +_RocketHideout4BattleText4:: text "The elevator" line "doesn't work? Who" cont "has the LIFT KEY?" done -_RocketHideout4EndBattleText4:: ; 82413 (20:6413) +_RocketHideout4EndBattleText4:: text "No!" prompt -_RocketHideout4Text_455ec:: ; 82418 (20:6418) +_RocketHideout4Text_455ec:: text "Oh no! I dropped" line "the LIFT KEY!" done diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/rocket_hideout_elevator.asm index 12fbad6d..c2ce930b 100644 --- a/text/maps/rocket_hideout_elevator.asm +++ b/text/maps/rocket_hideout_elevator.asm @@ -1,4 +1,4 @@ -_RocketElevatorText_4578b:: ; 82438 (20:6438) +_RocketElevatorText_4578b:: text "It appears to" line "need a key.@@" diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm index 99807e3e..e343ea6f 100644 --- a/text/maps/route_1.asm +++ b/text/maps/route_1.asm @@ -1,4 +1,4 @@ -_Route1ViridianMartSampleText:: ; 8d5bf (23:55bf) +_Route1ViridianMartSampleText:: text "Hi! I work at a" line "#MON MART." @@ -12,24 +12,24 @@ _Route1ViridianMartSampleText:: ; 8d5bf (23:55bf) cont "Here you go!" prompt -_Route1Text_1cae8:: ; 8d643 (23:5643) +_Route1Text_1cae8:: text $52, " got" line "@" TX_RAM wcf4b text "!@@" -_Route1Text_1caee:: ; 8d652 (23:5652) +_Route1Text_1caee:: text "We also carry" line "# BALLs for" cont "catching #MON!" done -_Route1Text_1caf3:: ; 8d67c (23:567c) +_Route1Text_1caf3:: text "You have too much" line "stuff with you!" done -_Route1Text2:: ; 8d69f (23:569f) +_Route1Text2:: text "See those ledges" line "along the road?" @@ -42,7 +42,7 @@ _Route1Text2:: ; 8d69f (23:569f) cont "quicker that way." done -_Route1Text3:: ; 8d720 (23:5720) +_Route1Text3:: text "ROUTE 1" line "PALLET TOWN -" cont "VIRIDIAN CITY" diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm index 795f7e69..19d5fa2b 100644 --- a/text/maps/route_10.asm +++ b/text/maps/route_10.asm @@ -1,101 +1,97 @@ -_Route10BattleText1:: ; 8e642 (23:6642) +_Route10BattleText1:: text "Wow, are you a" line "#MANIAC too?" cont "Want to see my" cont "collection?" done -_Route10EndBattleText1:: ; 8e67a (23:667a) +_Route10EndBattleText1:: text "Humph." line "I'm not angry!" prompt -_Route10AfterBattleText1:: ; 8e690 (23:6690) +_Route10AfterBattleText1:: text "I have more rare" line "#MON at home!" done -_Route10BattleText2:: ; 8e6b0 (23:66b0) +_Route10BattleText2:: text "Ha-hahah-ah-ha!" done -_Route10EndBattleText2:: ; 8e6c1 (23:66c1) +_Route10EndBattleText2:: text "Ha-haha!" line "Not laughing!" cont "Ha-hay fever!" cont "Haha-ha-choo!" prompt -_Route10AfterBattleText2:: ; 8e6f5 (23:66f5) +_Route10AfterBattleText2:: text "Haha-ha-choo!" line "Ha-choo!" cont "Snort! Snivel!" done -_Route10BattleText3:: ; 8e71c (23:671c) -IF DEF(_YELLOW) - text "Hi, kid, want to" -ELSE +_Route10BattleText3:: text "Hi kid, want to" -ENDC line "see my #MON?" done -_Route10EndBattleText3:: ; 8e73a (23:673a) +_Route10EndBattleText3:: text "Oh no!" line "My #MON!" prompt -_Route10AfterBattleText3:: ; 8e74b (23:674b) +_Route10AfterBattleText3:: text "I don't like you" line "for beating me!" done -_Route10BattleText4:: ; 8e76c (23:676c) +_Route10BattleText4:: text "I've been to a" line "#MON GYM a few" cont "times. But, I" cont "lost each time." done -_Route10EndBattleText4:: ; 8e7a8 (23:67a8) +_Route10EndBattleText4:: text "Ohh!" line "Blew it again!" prompt -_Route10AfterBattleText4:: ; 8e7bd (23:67bd) +_Route10AfterBattleText4:: text "I noticed some" line "#MANIACs" cont "prowling around." done -_Route10BattleText5:: ; 8e7e7 (23:67e7) +_Route10BattleText5:: text "Ah! This mountain" line "air is delicious!" done -_Route10EndBattleText5:: ; 8e80c (23:680c) +_Route10EndBattleText5:: text "That" line "cleared my head!" prompt -_Route10AfterBattleText5:: ; 8e823 (23:6823) +_Route10AfterBattleText5:: text "I feel bloated on" line "mountain air!" done -_Route10BattleText6:: ; 8e844 (23:6844) +_Route10BattleText6:: text "I'm feeling a bit" line "faint from this" cont "tough hike." done -_Route10EndBattleText6:: ; 8e872 (23:6872) +_Route10EndBattleText6:: text "I'm" line "not up to it!" prompt -_Route10AfterBattleText6:: ; 8e884 (23:6884) +_Route10AfterBattleText6:: text "The #MON here" line "are so chunky!" cont "There should be a" @@ -103,12 +99,12 @@ _Route10AfterBattleText6:: ; 8e884 (23:6884) cont "floral pattern!" done -_Route10Text9:: ; 8e8d4 (23:68d4) -_Route10Text7:: ; 8e8d4 (23:68d4) +_Route10Text9:: +_Route10Text7:: text "ROCK TUNNEL" done -_Route10Text10:: ; 8e8e1 (23:68e1) +_Route10Text10:: text "POWER PLANT" done diff --git a/text/maps/route_11_1.asm b/text/maps/route_11_1.asm index 0637cad3..e10825e9 100644 --- a/text/maps/route_11_1.asm +++ b/text/maps/route_11_1.asm @@ -1,123 +1,123 @@ -_Route11BattleText1:: ; 8e8ee (23:68ee) +_Route11BattleText1:: text "Win, lose or draw!" done -_Route11EndBattleText1:: ; 8e902 (23:6902) +_Route11EndBattleText1:: text "Atcha!" line "Didn't go my way!" prompt -_Route11AfterBattleText1:: ; 8e91b (23:691b) +_Route11AfterBattleText1:: text "#MON is life!" line "And to live is to" cont "gamble!" done -_Route11BattleText2:: ; 8e944 (23:6944) +_Route11BattleText2:: text "Competition! I" line "can't get enough!" done -_Route11EndBattleText2:: ; 8e965 (23:6965) +_Route11EndBattleText2:: text "I had" line "a chance!" prompt -_Route11AfterBattleText2:: ; 8e976 (23:6976) +_Route11AfterBattleText2:: text "You can't be a" line "coward in the" cont "world of #MON!" done -_Route11BattleText3:: ; 8e9a2 (23:69a2) +_Route11BattleText3:: text "Let's go, but" line "don't cheat!" done -_Route11EndBattleText3:: ; 8e9bc (23:69bc) +_Route11EndBattleText3:: text "Huh?" line "That's not right!" prompt -_Route11AfterBattleText3:: ; 8e9d3 (23:69d3) +_Route11AfterBattleText3:: text "I did my best! I" line "have no regrets!" done -_Route11BattleText4:: ; 8e9f6 (23:69f6) +_Route11BattleText4:: text "Careful!" line "I'm laying down" cont "some cables!" done -_Route11EndBattleText4:: ; 8ea1c (23:6a1c) +_Route11EndBattleText4:: text "That" line "was electric!" prompt -_Route11AfterBattleText4:: ; 8ea30 (23:6a30) +_Route11AfterBattleText4:: text "Spread the word" line "to save energy!" done -_Route11BattleText5:: ; 8ea51 (23:6a51) +_Route11BattleText5:: text "I just became a" line "trainer! But, I" cont "think I can win!" done -_Route11EndBattleText5:: ; 8ea83 (23:6a83) +_Route11EndBattleText5:: text "My" line "#MON couldn't!" prompt -_Route11AfterBattleText5:: ; 8ea95 (23:6a95) +_Route11AfterBattleText5:: text "What do you want?" line "Leave me alone!" done -_Route11BattleText6:: ; 8eab8 (23:6ab8) +_Route11BattleText6:: text "Fwahaha! I have" line "never lost!" done -_Route11EndBattleText6:: ; 8ead5 (23:6ad5) +_Route11EndBattleText6:: text "My" line "first loss!" prompt -_Route11AfterBattleText6:: ; 8eae5 (23:6ae5) +_Route11AfterBattleText6:: text "Luck of the draw!" line "Just luck!" done -_Route11BattleText7:: ; 8eb03 (23:6b03) +_Route11BattleText7:: text "I have never won" line "before..." done -_Route11EndBattleText7:: ; 8eb1f (23:6b1f) +_Route11EndBattleText7:: text "I saw" line "this coming..." prompt -_Route11AfterBattleText7:: ; 8eb35 (23:6b35) +_Route11AfterBattleText7:: text "It's just luck." line "Luck of the draw." done -_Route11BattleText8:: ; 8eb57 (23:6b57) +_Route11BattleText8:: text "I'm the best in" line "my class!" done -_Route11EndBattleText8:: ; 8eb71 (23:6b71) +_Route11EndBattleText8:: text "Darn!" line "I need to make my" cont "#MON stronger!" prompt -_Route11AfterBattleText8:: ; 8eb99 (23:6b99) +_Route11AfterBattleText8:: text "There's a fat" line "#MON that" cont "comes down from" @@ -127,7 +127,7 @@ _Route11AfterBattleText8:: ; 8eb99 (23:6b99) line "you can get it." done -_Route11BattleText9:: ; 8ebee (23:6bee) +_Route11BattleText9:: text "Watch out for" line "live wires!" done diff --git a/text/maps/route_11_2.asm b/text/maps/route_11_2.asm index 7edb3f06..537fea42 100644 --- a/text/maps/route_11_2.asm +++ b/text/maps/route_11_2.asm @@ -1,29 +1,29 @@ -_Route11EndBattleText9:: ; 90000 (24:4000) +_Route11EndBattleText9:: text "Whoa!" line "You spark plug!" prompt -_Route11AfterBattleText9:: ; 90017 (24:4017) +_Route11AfterBattleText9:: text "Well, better get" line "back to work." done -_Route11BattleText10:: ; 90037 (24:4037) +_Route11BattleText10:: text "My #MON should" line "be ready by now!" done -_Route11EndBattleText10:: ; 90058 (24:4058) +_Route11EndBattleText10:: text "Too" line "much, too young!" prompt -_Route11AfterBattleText10:: ; 9006e (24:406e) +_Route11AfterBattleText10:: text "I better go find" line "stronger ones!" done -_Route11Text11:: ; 9008f (24:408f) +_Route11Text11:: text "DIGLETT's CAVE" done diff --git a/text/maps/route_11_gate.asm b/text/maps/route_11_gate.asm index 46897a38..db9ad871 100644 --- a/text/maps/route_11_gate.asm +++ b/text/maps/route_11_gate.asm @@ -1,4 +1,4 @@ -_Route11GateText1:: ; 8c5f3 (23:45f3) +_Route11GateText1:: text "When you catch" line "lots of #MON," cont "isn't it hard to" diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/route_11_gate_upstairs.asm index 70c463ec..92eea2fb 100644 --- a/text/maps/route_11_gate_upstairs.asm +++ b/text/maps/route_11_gate_upstairs.asm @@ -1,4 +1,4 @@ -_Route11GateUpstairsText_494a3:: ; 8c689 (23:4689) +_Route11GateUpstairsText_494a3:: text "There are items on" line "the ground that" cont "can't be seen." @@ -28,7 +28,7 @@ _BinocularsNoSnorlaxText:: line "view!" done -_Route11GateUpstairsText_494d5:: ; 8c78b (23:478b) +_Route11GateUpstairsText_494d5:: text "Looked into the" line "binoculars." diff --git a/text/maps/route_12.asm b/text/maps/route_12.asm index 12925104..b0d05a30 100644 --- a/text/maps/route_12.asm +++ b/text/maps/route_12.asm @@ -1,144 +1,140 @@ -_Route12Text1:: ; 9009e (24:409e) +_Route12Text1:: text "A sleeping #MON" line "blocks the way!" done -_Route12Text13:: ; 900bf (24:40bf) +_Route12Text13:: text "SNORLAX woke up!" para "It attacked in a" line "grumpy rage!" done -_Route12Text14:: ; 900ef (24:40ef) +_Route12Text14:: text "SNORLAX calmed" line "down! With a big" cont "yawn, it returned" cont "to the mountains!" done -_Route12BattleText1:: ; 90134 (24:4134) +_Route12BattleText1:: text "Yeah! I got a" line "bite, here!" done -_Route12EndBattleText1:: ; 9014f (24:414f) +_Route12EndBattleText1:: text "Tch!" line "Just a small fry!" prompt -_Route12AfterBattleText1:: ; 90167 (24:4167) +_Route12AfterBattleText1:: text "Hang on! My line's" line "snagged!" done -_Route12BattleText2:: ; 90183 (24:4183) +_Route12BattleText2:: text "Be patient!" line "Fishing is a" cont "waiting game!" done -_Route12EndBattleText2:: ; 901ab (24:41ab) +_Route12EndBattleText2:: text "That" line "one got away!" prompt -_Route12AfterBattleText2:: ; 901bf (24:41bf) +_Route12AfterBattleText2:: text "With a better ROD," line "I could catch" cont "better #MON!" done -_Route12BattleText3:: ; 901ee (24:41ee) +_Route12BattleText3:: text "Have you found a" line "MOON STONE?" done -_Route12EndBattleText3:: ; 9020c (24:420c) +_Route12EndBattleText3:: text "Oww!" prompt -_Route12AfterBattleText3:: ; 90212 (24:4212) +_Route12AfterBattleText3:: text "I could have made" line "my #MON evolve" cont "with MOON STONE!" done -_Route12BattleText4:: ; 90245 (24:4245) +_Route12BattleText4:: text "Electricity is my" line "specialty!" done -_Route12EndBattleText4:: ; 90263 (24:4263) +_Route12EndBattleText4:: text "Unplugged!" prompt -_Route12AfterBattleText4:: ; 9026f (24:426f) +_Route12AfterBattleText4:: text "Water conducts" line "electricity, so" cont "you should zap" cont "sea #MON!" done -_Route12BattleText5:: ; 902a8 (24:42a8) +_Route12BattleText5:: text "The FISHING FOOL" line "vs. #MON KID!" done -_Route12EndBattleText5:: ; 902c8 (24:42c8) +_Route12EndBattleText5:: text "Too" line "much!" prompt -_Route12AfterBattleText5:: ; 902d3 (24:42d3) +_Route12AfterBattleText5:: text "You beat me at" line "#MON, but I'm" cont "good at fishing!" done -_Route12BattleText6:: ; 90301 (24:4301) +_Route12BattleText6:: text "I'd rather be" line "working!" done -_Route12EndBattleText6:: ; 90318 (24:4318) +_Route12EndBattleText6:: text "It's" line "not easy..." prompt -_Route12AfterBattleText6:: ; 90329 (24:4329) +_Route12AfterBattleText6:: text "It's all right." line "Losing doesn't" -IF DEF(_YELLOW) - cont "bug me anymore." -ELSE cont "bug me any more." -ENDC done -_Route12BattleText7:: ; 90358 (24:4358) +_Route12BattleText7:: text "You never know" line "what you could" cont "catch!" done -_Route12EndBattleText7:: ; 9037e (24:437e) +_Route12EndBattleText7:: text "Lost" line "it!" prompt -_Route12AfterBattleText7:: ; 90388 (24:4388) +_Route12AfterBattleText7:: text "I catch MAGIKARP" line "all the time, but" cont "they're so weak!" done -_Route12Text11:: ; 903bc (24:43bc) +_Route12Text11:: text "ROUTE 12 " line "North to LAVENDER" done -_Route12Text12:: ; 903d9 (24:43d9) +_Route12Text12:: text "SPORT FISHING AREA" done diff --git a/text/maps/route_12_gate.asm b/text/maps/route_12_gate.asm index a384c3bc..246c3eac 100644 --- a/text/maps/route_12_gate.asm +++ b/text/maps/route_12_gate.asm @@ -1,4 +1,4 @@ -_Route12GateText1:: ; 8c84a (23:484a) +_Route12GateText1:: text "There's a lookout" line "spot upstairs." done diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm index 3e8fb60c..a9d74099 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/route_12_gate_upstairs.asm @@ -1,22 +1,18 @@ -_TM39PreReceiveText:: ; 8c86b (23:486b) +_TM39PreReceiveText:: text "My #MON's" line "ashes are stored" cont "in #MON TOWER." para "You can have this" line "TM. I don't need" -IF DEF(_YELLOW) - cont "it anymore..." -ELSE cont "it any more..." -ENDC prompt -_ReceivedTM39Text:: ; 8c8c6 (23:48c6) +_ReceivedTM39Text:: text $52, " received" line "TM39!@@" -_TM39ExplanationText:: ; 8c8d9 (23:48d9) +_TM39ExplanationText:: text "TM39 is a move" line "called SWIFT." @@ -26,19 +22,19 @@ _TM39ExplanationText:: ; 8c8d9 (23:48d9) cont "afford to lose." done -_TM39NoRoomText:: ; 8c93c (23:493c) +_TM39NoRoomText:: text "You don't have" line "room for this." done -_Route12GateUpstairsText_495b8:: ; 8c95a (23:495a) +_Route12GateUpstairsText_495b8:: text "Looked into the" line "binoculars." para "A man fishing!" done -_Route12GateUpstairsText_495c4:: ; 8c986 (23:4986) +_Route12GateUpstairsText_495c4:: text "Looked into the" line "binoculars." diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm index 8ec4552b..97046b75 100644 --- a/text/maps/route_12_house.asm +++ b/text/maps/route_12_house.asm @@ -1,4 +1,4 @@ -_Route12HouseText_564c0:: ; 8c9b3 (23:49b3) +_Route12HouseText_564c0:: text "I'm the FISHING" line "GURU's brother!" @@ -9,7 +9,7 @@ _Route12HouseText_564c0:: ; 8c9b3 (23:49b3) line "fish?" done -_Route12HouseText_564c5:: ; 8ca00 (23:4a00) +_Route12HouseText_564c5:: text "Grand! I like" line "your style!" @@ -21,7 +21,7 @@ _Route12HouseText_564c5:: ; 8ca00 (23:4a00) TX_RAM wcf4b text "!@@" -_Route12HouseText_564ca:: ; 8ca4f (23:4a4f) +_Route12HouseText_564ca:: db $0 para "Fishing is a way" line "of life!" @@ -32,12 +32,12 @@ _Route12HouseText_564ca:: ; 8ca4f (23:4a4f) cont "one!" done -_Route12HouseText_564cf:: ; 8caa1 (23:4aa1) +_Route12HouseText_564cf:: text "Oh... That's so" line "disappointing..." done -_Route12HouseText_564d4:: ; 8cac2 (23:4ac2) +_Route12HouseText_564d4:: text "Hello there," line $52, "!" @@ -51,7 +51,7 @@ _Route12HouseText_564d4:: ; 8cac2 (23:4ac2) line "wherever you can!" done -_Route12HouseText_564d9:: ; 8cb38 (23:4b38) +_Route12HouseText_564d9:: text "Oh no!" para "I had a gift for" diff --git a/text/maps/route_13.asm b/text/maps/route_13.asm index 6f31acbd..c7034eb5 100644 --- a/text/maps/route_13.asm +++ b/text/maps/route_13.asm @@ -1,170 +1,170 @@ -_Route13BattleText2:: ; 903ed (24:43ed) +_Route13BattleText2:: text "My bird #MON" line "want to scrap!" done -_Route13EndBattleText2:: ; 9040a (24:440a) +_Route13EndBattleText2:: text "My" line "bird combo lost?" prompt -_Route13AfterBattleText2:: ; 9041f (24:441f) +_Route13AfterBattleText2:: text "My #MON look" line "happy even though" cont "they lost." done -_Route13BattleText3:: ; 9044a (24:444a) +_Route13BattleText3:: text "I'm told I'm good" line "for a kid!" done -_Route13EndBattleText3:: ; 90466 (24:4466) +_Route13EndBattleText3:: text "Ohh!" line "I lost!" prompt -_Route13AfterBattleText3:: ; 90474 (24:4474) +_Route13AfterBattleText3:: text "I want to become" line "a good trainer." cont "I'll train hard." done -_Route13BattleText4:: ; 904a6 (24:44a6) +_Route13BattleText4:: text "Wow! Your BADGEs" line "are too cool!" done -_Route13EndBattleText4:: ; 904c6 (24:44c6) +_Route13EndBattleText4:: text "Not" line "enough!" prompt -_Route13AfterBattleText4:: ; 904d3 (24:44d3) +_Route13AfterBattleText4:: text "You got those" line "BADGEs from GYM" cont "LEADERs. I know!" done -_Route13BattleText5:: ; 90503 (24:4503) +_Route13BattleText5:: text "My cute #MON" line "wish to make your" cont "acquaintance." done -_Route13EndBattleText5:: ; 90531 (24:4531) +_Route13EndBattleText5:: text "Wow!" line "You totally won!" prompt -_Route13AfterBattleText5:: ; 90548 (24:4548) +_Route13AfterBattleText5:: text "You have to make" line "#MON fight to" cont "toughen them up!" done -_Route13BattleText6:: ; 90579 (24:4579) +_Route13BattleText6:: text "I found CARBOS in" line "a cave once." done -_Route13EndBattleText6:: ; 90599 (24:4599) +_Route13EndBattleText6:: text "Just" line "messed up!" prompt -_Route13AfterBattleText6:: ; 905aa (24:45aa) +_Route13AfterBattleText6:: text "CARBOS boosted" line "the SPEED of my" cont "#MON." done -_Route13BattleText7:: ; 905d0 (24:45d0) +_Route13BattleText7:: text "The wind's blowing" line "my way!" done -_Route13EndBattleText7:: ; 905eb (24:45eb) +_Route13EndBattleText7:: text "The" line "wind turned!" prompt -_Route13AfterBattleText7:: ; 905fd (24:45fd) +_Route13AfterBattleText7:: text "I'm beat. I guess" line "I'll FLY home." done -_Route13BattleText8:: ; 9061d (24:461d) +_Route13BattleText8:: text "Sure, I'll play" line "with you!" done -_Route13EndBattleText8:: ; 90637 (24:4637) +_Route13EndBattleText8:: text "Oh!" line "You little brute!" prompt -_Route13AfterBattleText8:: ; 9064e (24:464e) +_Route13AfterBattleText8:: text "I wonder which is" line "stronger, male or" cont "female #MON?" done -_Route13BattleText9:: ; 90680 (24:4680) +_Route13BattleText9:: text "Do you want to" line "#MON with me?" done -_Route13EndBattleText9:: ; 9069e (24:469e) +_Route13EndBattleText9:: text "It's over" line "already?" prompt -_Route13AfterBattleText9:: ; 906b1 (24:46b1) +_Route13AfterBattleText9:: text "I don't know" line "anything about" cont "#MON. I just" cont "like cool ones!" done -_Route13BattleText10:: ; 906ea (24:46ea) +_Route13BattleText10:: text "What're you" line "lookin' at?" done -_Route13EndBattleText10:: ; 90702 (24:4702) +_Route13EndBattleText10:: text "Dang!" line "Stripped gears!" prompt -_Route13AfterBattleText10:: ; 90719 (24:4719) +_Route13AfterBattleText10:: text "Get lost!" done -_Route13BattleText11:: ; 90724 (24:4724) +_Route13BattleText11:: text "I always go with" line "bird #MON!" done -_Route13EndBattleText11:: ; 90741 (24:4741) +_Route13EndBattleText11:: text "Out" line "of power!" prompt -_Route13AfterBattleText11:: ; 90750 (24:4750) +_Route13AfterBattleText11:: text "I wish I could" line "fly like PIDGEY" cont "and PIDGEOTTO..." done -_Route13Text11:: ; 90781 (24:4781) +_Route13Text11:: text "TRAINER TIPS" para "Look to the left" line "of that post!" done -_Route13Text12:: ; 907ae (24:47ae) +_Route13Text12:: text "TRAINER TIPS" para "Use SELECT to" @@ -172,7 +172,7 @@ _Route13Text12:: ; 907ae (24:47ae) cont "the ITEM window!" done -_Route13Text13:: ; 907eb (24:47eb) +_Route13Text13:: text "ROUTE 13" line "North to SILENCE" cont "BRIDGE" diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm index b542274e..1371b5b0 100644 --- a/text/maps/route_14.asm +++ b/text/maps/route_14.asm @@ -1,151 +1,147 @@ -_Route14BattleText1:: ; 9080d (24:480d) +_Route14BattleText1:: text "You need to use" line "TMs to teach good" cont "moves to #MON!" done -_Route14EndBattleText1:: ; 9083f (24:483f) +_Route14EndBattleText1:: text "Not" line "good enough!" prompt -_Route14AfterBattleText1:: ; 90851 (24:4851) -IF DEF(_YELLOW) - text "You have some HMs," -ELSE +_Route14AfterBattleText1:: text "You have some HMs" -ENDC line "right? #MON" cont "can't ever forget" cont "those moves." done -_Route14BattleText2:: ; 9088e (24:488e) +_Route14BattleText2:: text "My bird #MON" line "should be ready" cont "for battle." done -_Route14EndBattleText2:: ; 908b8 (24:48b8) +_Route14EndBattleText2:: text "Not" line "ready yet!" prompt -_Route14AfterBattleText2:: ; 908c8 (24:48c8) +_Route14AfterBattleText2:: text "They need to learn" line "better moves." done -_Route14BattleText3:: ; 908ea (24:48ea) +_Route14BattleText3:: text "TMs are on sale" line "in CELADON!" cont "But, only a few" cont "people have HMs!" done -_Route14EndBattleText3:: ; 90928 (24:4928) +_Route14EndBattleText3:: text "Aww," line "bummer!" prompt -_Route14AfterBattleText3:: ; 90936 (24:4936) +_Route14AfterBattleText3:: text "Teach #MON" line "moves of the same" cont "element type for" cont "more power." done -_Route14BattleText4:: ; 90971 (24:4971) +_Route14BattleText4:: text "Have you taught" line "your bird #MON" cont "how to FLY?" done -_Route14EndBattleText4:: ; 9099d (24:499d) +_Route14EndBattleText4:: text "Shot" line "down in flames!" prompt -_Route14AfterBattleText4:: ; 909b3 (24:49b3) +_Route14AfterBattleText4:: text "Bird #MON are" line "my true love!" done -_Route14BattleText5:: ; 909d0 (24:49d0) +_Route14BattleText5:: text "Have you heard of" line "the legendary" cont "#MON?" done -_Route14EndBattleText5:: ; 909f7 (24:49f7) +_Route14EndBattleText5:: text "Why?" line "Why'd I lose?" prompt -_Route14AfterBattleText5:: ; 90a0a (24:4a0a) +_Route14AfterBattleText5:: text "The 3 legendary" line "#MON are all" cont "birds of prey." done -_Route14BattleText6:: ; 90a37 (24:4a37) +_Route14BattleText6:: text "I'm not into it," line "but OK! Let's go!" done -_Route14EndBattleText6:: ; 90a59 (24:4a59) +_Route14EndBattleText6:: text "I" line "knew it!" prompt -_Route14AfterBattleText6:: ; 90a65 (24:4a65) +_Route14AfterBattleText6:: text "Winning, losing," line "it doesn't matter" cont "in the long run!" done -_Route14BattleText7:: ; 90a99 (24:4a99) +_Route14BattleText7:: text "C'mon, c'mon." line "Let's go, let's" cont "go, let's go!" done -_Route14EndBattleText7:: ; 90ac1 (24:4ac1) +_Route14EndBattleText7:: text "Arrg!" line "Lost! Get lost!" prompt -_Route14AfterBattleText7:: ; 90ad8 (24:4ad8) +_Route14AfterBattleText7:: text "What, what, what?" line "What do you want?" done -_Route14BattleText8:: ; 90afd (24:4afd) +_Route14BattleText8:: text "Perfect! I need to" line "burn some time!" done -_Route14EndBattleText8:: ; 90b21 (24:4b21) +_Route14EndBattleText8:: text "What?" line "You!?" prompt -_Route14AfterBattleText8:: ; 90b2e (24:4b2e) +_Route14AfterBattleText8:: text "Raising #MON" line "is a drag, man." done -_Route14BattleText9:: ; 90b4c (24:4b4c) +_Route14BattleText9:: text "We ride out here" line "because there's" cont "more room!" done -_Route14EndBattleText9:: ; 90b78 (24:4b78) +_Route14EndBattleText9:: text "Wipe out!" prompt -_Route14AfterBattleText9:: ; 90b83 (24:4b83) +_Route14AfterBattleText9:: text "It's cool you" line "made your #MON" cont "so strong!" @@ -154,23 +150,23 @@ _Route14AfterBattleText9:: ; 90b83 (24:4b83) line "And you know it!" done -_Route14BattleText10:: ; 90bcc (24:4bcc) +_Route14BattleText10:: text "#MON fight?" line "Cool! Rumble!" done -_Route14EndBattleText10:: ; 90be7 (24:4be7) +_Route14EndBattleText10:: text "Blown" line "away!" prompt -_Route14AfterBattleText10:: ; 90bf4 (24:4bf4) +_Route14AfterBattleText10:: text "You know who'd" line "win, you and me" cont "one on one!" done -_Route14Text11:: ; 90c1f (24:4c1f) +_Route14Text11:: text "ROUTE 14" line "West to FUCHSIA" cont "CITY" diff --git a/text/maps/route_15.asm b/text/maps/route_15.asm index d217c9a4..1368b3d5 100644 --- a/text/maps/route_15.asm +++ b/text/maps/route_15.asm @@ -1,15 +1,15 @@ -_Route15BattleText1:: ; 90c3e (24:4c3e) +_Route15BattleText1:: text "Let me try out the" line "#MON I just" cont "got in a trade!" done -_Route15EndBattleText1:: ; 90c6e (24:4c6e) +_Route15EndBattleText1:: text "Not" line "good enough!" prompt -_Route15AfterBattleText1:: ; 90c80 (24:4c80) +_Route15AfterBattleText1:: text "You can't change" line "the nickname of" cont "any #MON you" @@ -19,152 +19,152 @@ _Route15AfterBattleText1:: ; 90c80 (24:4c80) line "Trainer can." done -_Route15BattleText2:: ; 90cdd (24:4cdd) +_Route15BattleText2:: text "You look gentle," line "so I think I can" cont "beat you!" done -_Route15EndBattleText2:: ; 90d0a (24:4d0a) +_Route15EndBattleText2:: text "No," line "wrong!" prompt -_Route15AfterBattleText2:: ; 90d16 (24:4d16) +_Route15AfterBattleText2:: text "I'm afraid of" line "BIKERs, they look" cont "so ugly and mean!" done -_Route15BattleText3:: ; 90d48 (24:4d48) +_Route15BattleText3:: text "When I whistle, I" line "can summon bird" cont "#MON!" done -_Route15EndBattleText3:: ; 90d71 (24:4d71) +_Route15EndBattleText3:: text "Ow!" line "That's tragic!" prompt -_Route15AfterBattleText3:: ; 90d84 (24:4d84) +_Route15AfterBattleText3:: text "Maybe I'm not cut" line "out for battles." done -_Route15BattleText4:: ; 90da7 (24:4da7) +_Route15BattleText4:: text "Hmm? My birds are" line "shivering! You're" cont "good, aren't you?" done -_Route15EndBattleText4:: ; 90ddc (24:4ddc) +_Route15EndBattleText4:: text "Just" line "as I thought!" prompt -_Route15AfterBattleText4:: ; 90df0 (24:4df0) +_Route15AfterBattleText4:: text "Did you know moves" line "like EARTHQUAKE" cont "don't have any" cont "effect on birds?" done -_Route15BattleText5:: ; 90e33 (24:4e33) +_Route15BattleText5:: text "Oh, you're a" line "little cutie!" done -_Route15EndBattleText5:: ; 90e4e (24:4e4e) +_Route15EndBattleText5:: text "You looked" line "so cute too!" prompt -_Route15AfterBattleText5:: ; 90e67 (24:4e67) +_Route15AfterBattleText5:: text "I forgive you!" line "I can take it!" done -_Route15BattleText6:: ; 90e86 (24:4e86) +_Route15BattleText6:: text "I raise #MON" line "because I live" cont "alone!" done -_Route15EndBattleText6:: ; 90eaa (24:4eaa) +_Route15EndBattleText6:: text "I didn't" line "ask for this!" prompt -_Route15AfterBattleText6:: ; 90ec1 (24:4ec1) +_Route15AfterBattleText6:: text "I just like going" line "home to be with" cont "my #MON!" done -_Route15BattleText7:: ; 90eed (24:4eed) +_Route15BattleText7:: text "Hey kid! C'mon!" line "I just got these!" done -_Route15EndBattleText7:: ; 90f0f (24:4f0f) +_Route15EndBattleText7:: text "Why" line "not?" prompt -_Route15AfterBattleText7:: ; 90f19 (24:4f19) +_Route15AfterBattleText7:: text "You only live" line "once, so I live" cont "as an outlaw!" cont "TEAM ROCKET RULES!" done -_Route15BattleText8:: ; 90f59 (24:4f59) +_Route15BattleText8:: text "Fork over all your" line "cash when you" cont "lose to me, kid!" done -_Route15EndBattleText8:: ; 90f8c (24:4f8c) +_Route15EndBattleText8:: text "That" line "can't be true!" prompt -_Route15AfterBattleText8:: ; 90fa0 (24:4fa0) +_Route15AfterBattleText8:: text "I was just joking" line "about the money!" done -_Route15BattleText9:: ; 90fc4 (24:4fc4) +_Route15BattleText9:: text "What's cool?" line "Trading #MON!" done -_Route15EndBattleText9:: ; 90fdf (24:4fdf) +_Route15EndBattleText9:: text "I" line "said trade!" prompt -_Route15AfterBattleText9:: ; 90fee (24:4fee) +_Route15AfterBattleText9:: text "I trade #MON" line "with my friends!" done -_Route15BattleText10:: ; 9100d (24:500d) +_Route15BattleText10:: text "Want to play with" line "my #MON?" done -_Route15EndBattleText10:: ; 91029 (24:5029) +_Route15EndBattleText10:: text "I was" line "too impatient!" prompt -_Route15AfterBattleText10:: ; 9103f (24:503f) +_Route15AfterBattleText10:: text "I'll go train with" line "weaker people.@@" -_Route15Text12:: ; 91062 (24:5062) +_Route15Text12:: text "ROUTE 15" line "West to FUCHSIA" cont "CITY" diff --git a/text/maps/route_15_gate.asm b/text/maps/route_15_gate.asm index c1bbd8c9..eb4ca6d3 100644 --- a/text/maps/route_15_gate.asm +++ b/text/maps/route_15_gate.asm @@ -1,4 +1,4 @@ -_Route15GateText1:: ; 8cb73 (23:4b73) +_Route15GateText1:: text "Are you working" line "on a #DEX?" diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/route_15_gate_upstairs.asm index 7207ecdf..310ecdba 100644 --- a/text/maps/route_15_gate_upstairs.asm +++ b/text/maps/route_15_gate_upstairs.asm @@ -1,4 +1,4 @@ -_Route15GateUpstairsText_4968c:: ; 8cbac (23:4bac) +_Route15GateUpstairsText_4968c:: text "EXP.ALL gives" line "EXP points to all" cont "the #MON with" @@ -15,7 +15,7 @@ _Route15GateUpstairsText_4968c:: ; 8cbac (23:4bac) cont "store it via PC." done -_Route15GateUpstairsText_49698:: ; 8cc65 (23:4c65) +_Route15GateUpstairsText_49698:: text "Looked into the" line "binoculars." diff --git a/text/maps/route_16.asm b/text/maps/route_16.asm index ec77ec6f..740ef8a1 100644 --- a/text/maps/route_16.asm +++ b/text/maps/route_16.asm @@ -1,123 +1,119 @@ -_Route16BattleText1:: ; 91081 (24:5081) +_Route16BattleText1:: text "What do you want?" done -_Route16EndBattleText1:: ; 91094 (24:5094) +_Route16EndBattleText1:: text "Don't you" line "dare laugh!" prompt -_Route16AfterBattleText1:: ; 910aa (24:50aa) +_Route16AfterBattleText1:: text "We like just" line "hanging here," cont "what's it to you?" done -_Route16BattleText2:: ; 910d7 (24:50d7) +_Route16BattleText2:: text "Nice BIKE!" line "Hand it over!" done -_Route16EndBattleText2:: ; 910f1 (24:50f1) -IF DEF(_YELLOW) - text "Knock-" -ELSE +_Route16EndBattleText2:: text "Knock" -ENDC line "out!" prompt -_Route16AfterBattleText2:: ; 910fd (24:50fd) +_Route16AfterBattleText2:: text "Forget it, who" line "needs your BIKE!" done -_Route16BattleText3:: ; 9111e (24:511e) +_Route16BattleText3:: text "Come out and play," line "little mouse!" done -_Route16EndBattleText3:: ; 91140 (24:5140) +_Route16EndBattleText3:: text "You" line "little rat!" prompt -_Route16AfterBattleText3:: ; 91151 (24:5151) +_Route16AfterBattleText3:: text "I hate losing!" line "Get away from me!" done -_Route16BattleText4:: ; 91173 (24:5173) +_Route16BattleText4:: text "Hey, you just" line "bumped me!" done -_Route16EndBattleText4:: ; 9118d (24:518d) +_Route16EndBattleText4:: text "Kaboom!" prompt -_Route16AfterBattleText4:: ; 91196 (24:5196) +_Route16AfterBattleText4:: text "You can also get" line "to FUCHSIA from" cont "VERMILION using a" cont "coastal road." done -_Route16BattleText5:: ; 911d8 (24:51d8) +_Route16BattleText5:: text "I'm feeling" line "hungry and mean!" done -_Route16EndBattleText5:: ; 911f5 (24:51f5) +_Route16EndBattleText5:: text "Bad," line "bad, bad!" prompt -_Route16AfterBattleText5:: ; 91205 (24:5205) +_Route16AfterBattleText5:: text "I like my #MON" line "ferocious! They" cont "tear up enemies!" done -_Route16BattleText6:: ; 91236 (24:5236) +_Route16BattleText6:: text "Sure, I'll go!" done -_Route16EndBattleText6:: ; 91245 (24:5245) +_Route16EndBattleText6:: text "Don't make" line "me mad!" prompt -_Route16AfterBattleText6:: ; 91258 (24:5258) +_Route16AfterBattleText6:: text "I like harassing" line "people with my" cont "vicious #MON!" done -_Route16Text7:: ; 91287 (24:5287) +_Route16Text7:: text "A sleeping #MON" line "blocks the way!" done -_Route16Text10:: ; 912a8 (24:52a8) +_Route16Text10:: text "SNORLAX woke up!" para "It attacked in a" line "grumpy rage!" done -_Route16Text11:: ; 912d8 (24:52d8) +_Route16Text11:: text "With a big yawn," line "SNORLAX returned" cont "to the mountains!" done -_Route16Text8:: ; 9130d (24:530d) +_Route16Text8:: text "Enjoy the slope!" line "CYCLING ROAD" done -_Route16Text9:: ; 9132c (24:532c) +_Route16Text9:: text "ROUTE 16" line "CELADON CITY -" cont "FUCHSIA CITY" diff --git a/text/maps/route_16_gate.asm b/text/maps/route_16_gate.asm index 2d3d5c62..f4f03e2f 100644 --- a/text/maps/route_16_gate.asm +++ b/text/maps/route_16_gate.asm @@ -1,22 +1,22 @@ -_Route16GateText_49777:: ; 8cca0 (23:4ca0) +_Route16GateText_49777:: text "No pedestrians" line "are allowed on" cont "CYCLING ROAD!" done -_Route16GateText_4977c:: ; 8cccd (23:4ccd) +_Route16GateText_4977c:: text "CYCLING ROAD is a" line "downhill course" cont "by the sea. It's" cont "a great ride." done -_Route16GateText_49781:: ; 8cd0e (23:4d0e) +_Route16GateText_49781:: text "Excuse me! Wait" line "up please!" done -_Route16GateText2:: ; 8cd2a (23:4d2a) +_Route16GateText2:: text "How'd you get in?" line "Good effort!" done diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/route_16_gate_upstairs.asm index 26767654..55a49274 100644 --- a/text/maps/route_16_gate_upstairs.asm +++ b/text/maps/route_16_gate_upstairs.asm @@ -1,15 +1,15 @@ -_Route16GateUpstairsText_49820:: ; 8cd49 (23:4d49) +_Route16GateUpstairsText_49820:: text "I'm going for a" line "ride with my girl" cont "friend!" done -_Route16GateUpstairsText_4982f:: ; 8cd73 (23:4d73) +_Route16GateUpstairsText_4982f:: text "We're going" line "riding together!" done -_Route16GateUpstairsText_4983b:: ; 8cd90 (23:4d90) +_Route16GateUpstairsText_4983b:: text "Looked into the" line "binoculars." @@ -17,7 +17,7 @@ _Route16GateUpstairsText_4983b:: ; 8cd90 (23:4d90) line "STORE!" done -_Route16GateUpstairsText_49847:: ; 8cdc6 (23:4dc6) +_Route16GateUpstairsText_49847:: text "Looked into the" line "binoculars." diff --git a/text/maps/route_16_house.asm b/text/maps/route_16_house.asm index c3099049..d84faf38 100644 --- a/text/maps/route_16_house.asm +++ b/text/maps/route_16_house.asm @@ -1,4 +1,4 @@ -_Route16HouseText3:: ; 8ce02 (23:4e02) +_Route16HouseText3:: text "Oh, you found my" line "secret retreat!" @@ -8,11 +8,11 @@ _Route16HouseText3:: ; 8ce02 (23:4e02) cont "to you with this!" prompt -_ReceivedHM02Text:: ; 8ce66 (23:4e66) +_ReceivedHM02Text:: text $52, " received" line "HM02!@@" -_HM02ExplanationText:: ; 8ce79 (23:4e79) +_HM02ExplanationText:: text "HM02 is FLY." line "It will take you" cont "back to any town." @@ -21,12 +21,12 @@ _HM02ExplanationText:: ; 8ce79 (23:4e79) line "use!" done -_HM02NoRoomText:: ; 8cebe (23:4ebe) +_HM02NoRoomText:: text "You don't have any" line "room for this." done -_Route16HouseText_1e652:: ; 8cee0 (23:4ee0) +_Route16HouseText_1e652:: text "FEAROW: Kyueen!" done diff --git a/text/maps/route_17.asm b/text/maps/route_17.asm index b053b473..db9bf4d2 100644 --- a/text/maps/route_17.asm +++ b/text/maps/route_17.asm @@ -1,164 +1,160 @@ -_Route17BattleText1:: ; 91352 (24:5352) +_Route17BattleText1:: text "There's no money" line "in fighting kids!" done -_Route17EndBattleText1:: ; 91375 (24:5375) +_Route17EndBattleText1:: text "Burned" line "out!" prompt -_Route17AfterBattleText1:: ; 91382 (24:5382) +_Route17AfterBattleText1:: text "Good stuff is" line "lying around on" cont "CYCLING ROAD!" done -_Route17BattleText2:: ; 913af (24:53af) +_Route17BattleText2:: text "What do you want," line "kiddo?" done -_Route17EndBattleText2:: ; 913c9 (24:53c9) +_Route17EndBattleText2:: text "Whoo!" prompt -_Route17AfterBattleText2:: ; 913d0 (24:53d0) +_Route17AfterBattleText2:: text "I could belly-" line "bump you outta" cont "here!" done -_Route17BattleText3:: ; 913f5 (24:53f5) +_Route17BattleText3:: text "You heading to" line "FUCHSIA?" done -_Route17EndBattleText3:: ; 9140e (24:540e) +_Route17EndBattleText3:: text "Crash and" line "burn!" prompt -_Route17AfterBattleText3:: ; 9141f (24:541f) +_Route17AfterBattleText3:: text "I love racing" line "downhill!" done -_Route17BattleText4:: ; 91438 (24:5438) +_Route17BattleText4:: text "We're BIKERs!" line "Highway stars!" done -_Route17EndBattleText4:: ; 91455 (24:5455) +_Route17EndBattleText4:: text "Smoked!" prompt -_Route17AfterBattleText4:: ; 9145e (24:545e) +_Route17AfterBattleText4:: text "Are you looking" line "for adventure?" done -_Route17BattleText5:: ; 9147e (24:547e) +_Route17BattleText5:: text "Let VOLTORB" line "electrify you!" done -_Route17EndBattleText5:: ; 9149a (24:549a) +_Route17EndBattleText5:: text "Grounded" line "out!" prompt -_Route17AfterBattleText5:: ; 914a9 (24:54a9) +_Route17AfterBattleText5:: text "I got my VOLTORB" line "at the abandoned" cont "POWER PLANT." done -_Route17BattleText6:: ; 914d9 (24:54d9) +_Route17BattleText6:: text "My #MON won't" line "evolve! Why?" done -_Route17EndBattleText6:: ; 914f4 (24:54f4) +_Route17EndBattleText6:: text "Why," line "you!" prompt -_Route17AfterBattleText6:: ; 914ff (24:54ff) +_Route17AfterBattleText6:: text "Maybe some #MON" line "need element" cont "STONEs to evolve." done -_Route17BattleText7:: ; 9152f (24:552f) +_Route17BattleText7:: text "I need a little" line "exercise!" done -_Route17EndBattleText7:: ; 9154a (24:554a) +_Route17EndBattleText7:: text "Whew!" line "Good workout!" prompt -_Route17AfterBattleText7:: ; 9155f (24:555f) +_Route17AfterBattleText7:: text "I'm sure I lost" line "weight there!" done -_Route17BattleText8:: ; 9157d (24:557d) +_Route17BattleText8:: text "Be a rebel!" done -_Route17EndBattleText8:: ; 9158a (24:558a) +_Route17EndBattleText8:: text "Aaaargh!" prompt -_Route17AfterBattleText8:: ; 91594 (24:5594) +_Route17AfterBattleText8:: text "Be ready to fight" line "for your beliefs!" done -_Route17BattleText9:: ; 915b9 (24:55b9) +_Route17BattleText9:: text "Nice BIKE!" line "How's it handle?" done -_Route17EndBattleText9:: ; 915d5 (24:55d5) +_Route17EndBattleText9:: text "Shoot!" prompt -_Route17AfterBattleText9:: ; 915dd (24:55dd) +_Route17AfterBattleText9:: text "The slope makes" line "it hard to steer!" done -_Route17BattleText10:: ; 91600 (24:5600) -IF DEF(_YELLOW) - text "Get lost, kid!" -ELSE +_Route17BattleText10:: text "Get lost kid!" -ENDC line "I'm bushed!" done -_Route17EndBattleText10:: ; 9161a (24:561a) +_Route17EndBattleText10:: text "Are you" line "satisfied?" prompt -_Route17AfterBattleText10:: ; 9162e (24:562e) +_Route17AfterBattleText10:: text "I need to catch" line "a few Zs!" done -_Route17Text11:: ; 91649 (24:5649) +_Route17Text11:: text "It's a notice!" para "Watch out for" line "discarded items!" done -_Route17Text12:: ; 91677 (24:5677) +_Route17Text12:: text "TRAINER TIPS" para "All #MON are" @@ -170,7 +166,7 @@ _Route17Text12:: ; 91677 (24:5677) cont "different rates." done -_Route17Text13:: ; 916d8 (24:56d8) +_Route17Text13:: text "TRAINER TIPS" para "Press the A or B" @@ -179,13 +175,13 @@ _Route17Text13:: ; 916d8 (24:56d8) cont "slope." done -_Route17Text14:: ; 91721 (24:5721) +_Route17Text14:: text "ROUTE 17" line "CELADON CITY -" cont "FUCHSIA CITY" done -_Route17Text15:: ; 91747 (24:5747) +_Route17Text15:: text "It's a notice!" para "Don't throw the" @@ -193,7 +189,7 @@ _Route17Text15:: ; 91747 (24:5747) cont "BALLs instead!" done -_Route17Text16:: ; 91782 (24:5782) +_Route17Text16:: text "CYCLING ROAD" line "Slope ends here!" done diff --git a/text/maps/route_18.asm b/text/maps/route_18.asm index f8dc798f..31e921bd 100644 --- a/text/maps/route_18.asm +++ b/text/maps/route_18.asm @@ -1,57 +1,57 @@ -_Route18BattleText1:: ; 917a1 (24:57a1) +_Route18BattleText1:: text "I always check" line "every grassy area" cont "for new #MON." done -_Route18EndBattleText1:: ; 917d1 (24:57d1) +_Route18EndBattleText1:: text "Tch!" prompt -_Route18AfterBattleText1:: ; 917d7 (24:57d7) +_Route18AfterBattleText1:: text "I wish I had a" line "BIKE!" done -_Route18BattleText2:: ; 917ed (24:57ed) +_Route18BattleText2:: text "Kurukkoo!" line "How do you like" cont "my bird call?" done -_Route18EndBattleText2:: ; 91816 (24:5816) +_Route18EndBattleText2:: text "I" line "had to bug you!" prompt -_Route18AfterBattleText2:: ; 91829 (24:5829) +_Route18AfterBattleText2:: text "I also collect sea" line "#MON on" cont "weekends!" done -_Route18BattleText3:: ; 9184f (24:584f) +_Route18BattleText3:: text "This is my turf!" line "Get out of here!" done -_Route18EndBattleText3:: ; 91872 (24:5872) +_Route18EndBattleText3:: text "Darn!" prompt -_Route18AfterBattleText3:: ; 91879 (24:5879) +_Route18AfterBattleText3:: text "This is my fave" line "#MON hunting" cont "area!" done -_Route18Text4:: ; 9189d (24:589d) +_Route18Text4:: text "ROUTE 18" line "CELADON CITY -" cont "FUCHSIA CITY" done -_Route18Text5:: ; 918c3 (24:58c3) +_Route18Text5:: text "CYCLING ROAD" line "No pedestrians" cont "permitted!" diff --git a/text/maps/route_18_gate.asm b/text/maps/route_18_gate.asm index 0298465d..964a32e5 100644 --- a/text/maps/route_18_gate.asm +++ b/text/maps/route_18_gate.asm @@ -1,15 +1,15 @@ -_Route18GateText_49928:: ; 8cef1 (23:4ef1) +_Route18GateText_49928:: text "You need a BICYCLE" line "for CYCLING ROAD!" done -_Route18GateText_4992d:: ; 8cf17 (23:4f17) +_Route18GateText_4992d:: text "CYCLING ROAD is" line "all uphill from" cont "here." done -_Route18GateText_49932:: ; 8cf3e (23:4f3e) +_Route18GateText_49932:: text "Excuse me!" done diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/route_18_gate_upstairs.asm index 59b92e6a..a1778cb6 100644 --- a/text/maps/route_18_gate_upstairs.asm +++ b/text/maps/route_18_gate_upstairs.asm @@ -1,4 +1,4 @@ -_Route18GateUpstairsText_49993:: ; 8cf4a (23:4f4a) +_Route18GateUpstairsText_49993:: text "Looked into the" line "binoculars." @@ -6,7 +6,7 @@ _Route18GateUpstairsText_49993:: ; 8cf4a (23:4f4a) line "the west!" done -_Route18GateUpstairsText_4999f:: ; 8cf83 (23:4f83) +_Route18GateUpstairsText_4999f:: text "Looked into the" line "binoculars." diff --git a/text/maps/route_19.asm b/text/maps/route_19.asm index 9789237c..ae6e7334 100644 --- a/text/maps/route_19.asm +++ b/text/maps/route_19.asm @@ -1,156 +1,156 @@ -_Route19BattleText1:: ; 918eb (24:58eb) +_Route19BattleText1:: text "Have to warm up" line "before my swim!" done -_Route19EndBattleText1:: ; 9190c (24:590c) +_Route19EndBattleText1:: text "All" line "warmed up!" prompt -_Route19AfterBattleText1:: ; 9191c (24:591c) +_Route19AfterBattleText1:: text "Thanks, kid! I'm" line "ready for a swim!" done -_Route19BattleText2:: ; 9193f (24:593f) +_Route19BattleText2:: text "Wait! You'll have" line "a heart attack!" done -_Route19EndBattleText2:: ; 91961 (24:5961) +_Route19EndBattleText2:: text "Ooh!" line "That's chilly!" prompt -_Route19AfterBattleText2:: ; 91975 (24:5975) +_Route19AfterBattleText2:: text "Watch out for" line "TENTACOOL!" done -_Route19BattleText3:: ; 9198f (24:598f) +_Route19BattleText3:: text "I love swimming!" line "What about you?" done -_Route19EndBattleText3:: ; 919b1 (24:59b1) +_Route19EndBattleText3:: text "Belly" line "flop!" prompt -_Route19AfterBattleText3:: ; 919be (24:59be) +_Route19AfterBattleText3:: text "I can beat #MON" line "at swimming!" done -_Route19BattleText4:: ; 919dc (24:59dc) +_Route19BattleText4:: text "What's beyond the" line "horizon?" done -_Route19EndBattleText4:: ; 919f7 (24:59f7) +_Route19EndBattleText4:: text "Glub!" prompt -_Route19AfterBattleText4:: ; 919fe (24:59fe) +_Route19AfterBattleText4:: text "I see a couple of" line "islands!" done -_Route19BattleText5:: ; 91a1a (24:5a1a) +_Route19BattleText5:: text "I tried diving" line "for #MON, but" cont "it was a no go!" done -_Route19EndBattleText5:: ; 91a48 (24:5a48) +_Route19EndBattleText5:: text "Help!" prompt -_Route19AfterBattleText5:: ; 91a4f (24:5a4f) +_Route19AfterBattleText5:: text "You have to fish" line "for sea #MON!" done -_Route19BattleText6:: ; 91a6f (24:5a6f) +_Route19BattleText6:: text "I look at the" line "sea to forget!" done -_Route19EndBattleText6:: ; 91a8d (24:5a8d) +_Route19EndBattleText6:: text "Ooh!" line "Traumatic!" prompt -_Route19AfterBattleText6:: ; 91a9e (24:5a9e) +_Route19AfterBattleText6:: text "I'm looking at the" line "sea to forget!" done -_Route19BattleText7:: ; 91ac0 (24:5ac0) +_Route19BattleText7:: text "Oh, I just love" line "your ride! Can I" cont "have it if I win?" done -_Route19EndBattleText7:: ; 91af4 (24:5af4) +_Route19EndBattleText7:: text "Oh!" line "I lost!" prompt -_Route19AfterBattleText7:: ; 91b01 (24:5b01) +_Route19AfterBattleText7:: text "It's still a long" line "way to go to" cont "SEAFOAM ISLANDS." done -_Route19BattleText8:: ; 91b31 (24:5b31) +_Route19BattleText8:: text "Swimming's great!" line "Sunburns aren't!" done -_Route19EndBattleText8:: ; 91b53 (24:5b53) +_Route19EndBattleText8:: text "Shocker!" prompt -_Route19AfterBattleText8:: ; 91b5d (24:5b5d) +_Route19AfterBattleText8:: text "My boy friend" line "wanted to swim to" cont "SEAFOAM ISLANDS." done -_Route19BattleText9:: ; 91b8f (24:5b8f) +_Route19BattleText9:: text "These waters are" line "treacherous!" done -_Route19EndBattleText9:: ; 91bae (24:5bae) +_Route19EndBattleText9:: text "Ooh!" line "Dangerous!" prompt -_Route19AfterBattleText9:: ; 91bbf (24:5bbf) +_Route19AfterBattleText9:: text "I got a cramp!" line "Glub, glub..." done -_Route19BattleText10:: ; 91bdd (24:5bdd) +_Route19BattleText10:: text "I swam here, but" line "I'm tired." done -_Route19EndBattleText10:: ; 91bf9 (24:5bf9) +_Route19EndBattleText10:: text "I'm" line "exhausted..." prompt -_Route19AfterBattleText10:: ; 91c0a (24:5c0a) +_Route19AfterBattleText10:: text "LAPRAS is so big," line "it must keep you" cont "dry on water." done -_Route19Text11:: ; 91c3c (24:5c3c) +_Route19Text11:: text "SEA ROUTE 19" line "FUCHSIA CITY -" cont "SEAFOAM ISLANDS" diff --git a/text/maps/route_2.asm b/text/maps/route_2.asm index 51c19737..2419abbe 100644 --- a/text/maps/route_2.asm +++ b/text/maps/route_2.asm @@ -1,10 +1,10 @@ -_Route2Text3:: ; 8d745 (23:5745) +_Route2Text3:: text "ROUTE 2" line "VIRIDIAN CITY -" cont "PEWTER CITY" done -_Route2Text4:: ; 8d76a (23:576a) +_Route2Text4:: text "DIGLETT's CAVE" done diff --git a/text/maps/route_20.asm b/text/maps/route_20.asm index 101ef92c..c69dec51 100644 --- a/text/maps/route_20.asm +++ b/text/maps/route_20.asm @@ -1,157 +1,157 @@ -_Route20BattleText1:: ; 91c69 (24:5c69) +_Route20BattleText1:: text "The water is" line "shallow here." done -_Route20EndBattleText1:: ; 91c85 (24:5c85) +_Route20EndBattleText1:: text "Splash!" prompt -_Route20AfterBattleText1:: ; 91c8e (24:5c8e) +_Route20AfterBattleText1:: text "I wish I could" line "ride my #MON." done -_Route20BattleText2:: ; 91cac (24:5cac) +_Route20BattleText2:: text "SEAFOAM is a" line "quiet getaway!" done -_Route20EndBattleText2:: ; 91cc9 (24:5cc9) +_Route20EndBattleText2:: text "Quit it!" prompt -_Route20AfterBattleText2:: ; 91cd3 (24:5cd3) +_Route20AfterBattleText2:: text "There's a huge" line "cavern underneath" cont "this island." done -_Route20BattleText3:: ; 91d01 (24:5d01) +_Route20BattleText3:: text "I love floating" line "with the fishes!" done -_Route20EndBattleText3:: ; 91d23 (24:5d23) +_Route20EndBattleText3:: text "Yowch!" prompt -_Route20AfterBattleText3:: ; 91d2b (24:5d2b) +_Route20AfterBattleText3:: text "Want to float" line "with me?" done -_Route20BattleText4:: ; 91d43 (24:5d43) +_Route20BattleText4:: text "Are you on" line "vacation too?" done -_Route20EndBattleText4:: ; 91d5d (24:5d5d) +_Route20EndBattleText4:: text "No" line "mercy at all!" prompt -_Route20AfterBattleText4:: ; 91d6f (24:5d6f) +_Route20AfterBattleText4:: text "SEAFOAM used to" line "be one island!" done -_Route20BattleText5:: ; 91d8f (24:5d8f) +_Route20BattleText5:: text "Check out my buff" line "physique!" done -_Route20EndBattleText5:: ; 91dac (24:5dac) +_Route20EndBattleText5:: text "Wimpy!" prompt -_Route20AfterBattleText5:: ; 91db4 (24:5db4) +_Route20AfterBattleText5:: text "I should've been" line "buffing up my" cont "#MON, not me!" done -_Route20BattleText6:: ; 91de1 (24:5de1) +_Route20BattleText6:: text "Why are you" line "riding a #MON?" cont "Can't you swim?" done -_Route20EndBattleText6:: ; 91e0c (24:5e0c) +_Route20EndBattleText6:: text "Ouch!" line "Torpedoed!" prompt -_Route20AfterBattleText6:: ; 91e1e (24:5e1e) +_Route20AfterBattleText6:: text "Riding a #MON" line "sure looks fun!" done -_Route20BattleText7:: ; 91e3d (24:5e3d) +_Route20BattleText7:: text "I rode my bird" line "#MON here!" done -_Route20EndBattleText7:: ; 91e58 (24:5e58) +_Route20EndBattleText7:: text "Oh" line "no!" prompt -_Route20AfterBattleText7:: ; 91e60 (24:5e60) +_Route20AfterBattleText7:: text "My birds can't" line "FLY me back!" done -_Route20BattleText8:: ; 91e7c (24:5e7c) +_Route20BattleText8:: text "My boy friend gave" line "me big pearls!" done -_Route20EndBattleText8:: ; 91e9f (24:5e9f) +_Route20EndBattleText8:: text "Don't" line "touch my pearls!" prompt -_Route20AfterBattleText8:: ; 91eb6 (24:5eb6) +_Route20AfterBattleText8:: text "Will my pearls" line "grow bigger" cont "inside CLOYSTER?" done -_Route20BattleText9:: ; 91ee3 (24:5ee3) +_Route20BattleText9:: text "I swam here from" line "CINNABAR ISLAND!" done -_Route20EndBattleText9:: ; 91f06 (24:5f06) +_Route20EndBattleText9:: text "I'm" line "so disappointed!" prompt -_Route20AfterBattleText9:: ; 91f1b (24:5f1b) +_Route20AfterBattleText9:: text "#MON have" line "taken over an" cont "abandoned mansion" cont "on CINNABAR!" done -_Route20BattleText10:: ; 91f53 (24:5f53) +_Route20BattleText10:: text "CINNABAR, in the" line "west, has a LAB" cont "for #MON." done -_Route20EndBattleText10:: ; 91f7f (24:5f7f) +_Route20EndBattleText10:: text "Wait!" prompt -_Route20AfterBattleText10:: ; 91f86 (24:5f86) +_Route20AfterBattleText10:: text "CINNABAR is a " line "volcanic island!" done -_Route20Text12:: ; 91fa7 (24:5fa7) -_Route20Text11:: ; 91fa7 (24:5fa7) +_Route20Text12:: +_Route20Text11:: text "SEAFOAM ISLANDS" done diff --git a/text/maps/route_21.asm b/text/maps/route_21.asm index 032e7c28..d94bdfac 100644 --- a/text/maps/route_21.asm +++ b/text/maps/route_21.asm @@ -1,137 +1,137 @@ -_Route21BattleText1:: ; 91fb8 (24:5fb8) +_Route21BattleText1:: text "You want to know" line "if the fish are" cont "biting?" done -_Route21EndBattleText1:: ; 91fe2 (24:5fe2) +_Route21EndBattleText1:: text "Dang!" prompt -_Route21AfterBattleText1:: ; 91fe9 (24:5fe9) +_Route21AfterBattleText1:: text "I can't catch" line "anything good!" done -_Route21BattleText2:: ; 92006 (24:6006) +_Route21BattleText2:: text "I got a big haul!" line "Wanna go for it?" done -_Route21EndBattleText2:: ; 9202a (24:602a) +_Route21EndBattleText2:: text "Darn" line "MAGIKARP!" prompt -_Route21AfterBattleText2:: ; 9203a (24:603a) +_Route21AfterBattleText2:: text "I seem to only" line "catch MAGIKARP!" done -_Route21BattleText3:: ; 9205a (24:605a) +_Route21BattleText3:: text "The sea cleanses" line "my body and soul!" done -_Route21EndBattleText3:: ; 9207e (24:607e) +_Route21EndBattleText3:: text "Ayah!" prompt -_Route21AfterBattleText3:: ; 92085 (24:6085) +_Route21AfterBattleText3:: text "I like the" line "mountains too!" done -_Route21BattleText4:: ; 920a0 (24:60a0) +_Route21BattleText4:: text "What's wrong with" line "me swimming?" done -_Route21EndBattleText4:: ; 920bf (24:60bf) +_Route21EndBattleText4:: text "Cheap" line "shot!" prompt -_Route21AfterBattleText4:: ; 920cc (24:60cc) +_Route21AfterBattleText4:: text "I look like what?" line "A studded inner" cont "tube? Get lost!" done -_Route21BattleText5:: ; 920ff (24:60ff) +_Route21BattleText5:: text "I caught all my" line "#MON at sea!" done -_Route21EndBattleText5:: ; 9211d (24:611d) +_Route21EndBattleText5:: text "Diver!!" line "Down!!" prompt -_Route21AfterBattleText5:: ; 9212d (24:612d) +_Route21AfterBattleText5:: text "Where'd you catch" line "your #MON?" done -_Route21BattleText6:: ; 9214a (24:614a) +_Route21BattleText6:: text "Right now, I'm in" line "a triathlon meet!" done -_Route21EndBattleText6:: ; 9216e (24:616e) +_Route21EndBattleText6:: text "Pant..." line "pant...pant..." prompt -_Route21AfterBattleText6:: ; 92186 (24:6186) +_Route21AfterBattleText6:: text "I'm beat!" line "But, I still have" cont "the bike race and" cont "marathon left!" done -_Route21BattleText7:: ; 921c3 (24:61c3) +_Route21BattleText7:: text "Ahh! Feel the sun" line "and the wind!" done -_Route21EndBattleText7:: ; 921e4 (24:61e4) +_Route21EndBattleText7:: text "Yow!" line "I lost!" prompt -_Route21AfterBattleText7:: ; 921f2 (24:61f2) +_Route21AfterBattleText7:: text "I'm sunburnt to a" line "crisp!" done -_Route21BattleText8:: ; 9220b (24:620b) +_Route21BattleText8:: text "Hey, don't scare" line "away the fish!" done -_Route21EndBattleText8:: ; 9222b (24:622b) +_Route21EndBattleText8:: text "Sorry!" line "I didn't mean it!" prompt -_Route21AfterBattleText8:: ; 92244 (24:6244) +_Route21AfterBattleText8:: text "I was just angry" line "that I couldn't" cont "catch anything." done -_Route21BattleText9:: ; 92275 (24:6275) +_Route21BattleText9:: text "Keep me company" line "'til I get a hit!" done -_Route21EndBattleText9:: ; 92297 (24:6297) +_Route21EndBattleText9:: text "That" line "burned some time." prompt -_Route21AfterBattleText9:: ; 922af (24:62af) +_Route21AfterBattleText9:: text "Oh wait! I got a" line "bite! Yeah!" done diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index 9935ce80..2a46d5b4 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -1,4 +1,4 @@ -_Route22RivalBeforeBattleText1:: ; 922cd (24:62cd) +_Route22RivalBeforeBattleText1:: text $53, ": Hey!" line $52, "!" @@ -17,7 +17,7 @@ _Route22RivalBeforeBattleText1:: ; 922cd (24:62cd) cont "get any stronger?" done -_Route22RivalAfterBattleText1:: ; 9236f (24:636f) +_Route22RivalAfterBattleText1:: text "I heard #MON" line "LEAGUE has many" cont "tough trainers!" @@ -31,13 +31,13 @@ _Route22RivalAfterBattleText1:: ; 9236f (24:636f) cont "a move on!" done -_Route22RivalDefeatedText1:: ; 923f4 (24:63f4) +_Route22RivalDefeatedText1:: text "Awww!" line "You just lucked" cont "out!" prompt -_Route22Text_511bc:: ; 92410 (24:6410) +_Route22Text_511bc:: text $53, ": What?" line "Why do I have 2" cont "#MON?" @@ -46,7 +46,7 @@ _Route22Text_511bc:: ; 92410 (24:6410) cont "some more too!" prompt -_Route22RivalBeforeBattleText2:: ; 92450 (24:6450) +_Route22RivalBeforeBattleText2:: text $53, ": What?" line $52, "! What a" cont "surprise to see" @@ -59,21 +59,15 @@ _Route22RivalBeforeBattleText2:: ; 92450 (24:6450) line "the BADGEs too?" cont "That's cool!" -IF DEF(_YELLOW) - para "Then I'll whip" - line "you, ", $52, ", as" - cont "a warmup for" -ELSE para "Then I'll whip you" line $52, " as a" cont "warm up for" -ENDC cont "#MON LEAGUE!" para "Come on!" done -_Route22RivalAfterBattleText2:: ; 92506 (24:6506) +_Route22RivalAfterBattleText2:: text "That loosened me" line "up! I'm ready for" cont "#MON LEAGUE!" @@ -86,14 +80,14 @@ _Route22RivalAfterBattleText2:: ; 92506 (24:6506) cont "here. Smell ya!" done -_Route22RivalDefeatedText2:: ; 92583 (24:6583) +_Route22RivalDefeatedText2:: text "What!?" para "I was just" line "careless!" prompt -_Route22Text_511d0:: ; 925a0 (24:65a0) +_Route22Text_511d0:: text $53, ": Hahaha!" line $52, "! That's" cont "your best? You're" @@ -104,7 +98,7 @@ _Route22Text_511d0:: ; 925a0 (24:65a0) line "more! You loser!" prompt -_Route22FrontGateText:: ; 92606 (24:6606) +_Route22FrontGateText:: text "#MON LEAGUE" line "Front Gate" done diff --git a/text/maps/route_23.asm b/text/maps/route_23.asm index ab73a363..0807cc91 100644 --- a/text/maps/route_23.asm +++ b/text/maps/route_23.asm @@ -1,4 +1,4 @@ -_VictoryRoadGuardText1:: ; 9261e (24:661e) +_VictoryRoadGuardText1:: text "You can pass here" line "only if you have" cont "the @" @@ -14,7 +14,7 @@ _VictoryRoadGuardText1:: ; 9261e (24:661e) line "it to get to" cont "#MON LEAGUE!@@" -_VictoryRoadGuardText2:: ; 92696 (24:6696) +_VictoryRoadGuardText2:: text "You can pass here" line "only if you have" cont "the @" @@ -26,13 +26,13 @@ _VictoryRoadGuardText2:: ; 92696 (24:6696) TX_RAM wcd6d text "!@@" -_VictoryRoadGuardText_513a3:: ; 926dd (24:66dd) +_VictoryRoadGuardText_513a3:: db $0 para "OK then! Please," line "go right ahead!" done -_Route23Text8:: ; 92700 (24:6700) +_Route23Text8:: text "VICTORY ROAD GATE" line "- #MON LEAGUE" done diff --git a/text/maps/route_24_1.asm b/text/maps/route_24_1.asm index 84a6d720..3a8d6d9a 100644 --- a/text/maps/route_24_1.asm +++ b/text/maps/route_24_1.asm @@ -1,26 +1,26 @@ -_Route24Text_51510:: ; 92721 (24:6721) +_Route24Text_51510:: text "Congratulations!" line "You beat our 5" cont "contest trainers!@@" -_Route24Text_51515:: ; 92755 (24:6755) +_Route24Text_51515:: db $0 para "You just earned a" line "fabulous prize!" prompt -_Route24Text_5151a:: ; 92779 (24:6779) +_Route24Text_5151a:: text $52, " received" line "a @" TX_RAM wcf4b text "!@@" -_Route24Text_51521:: ; 9278f (24:678f) +_Route24Text_51521:: text "You don't have" line "any room!" done -_Route24Text_51526:: ; 927a8 (24:67a8) +_Route24Text_51526:: text "By the way, would" line "you like to join" cont "TEAM ROCKET?" @@ -46,19 +46,19 @@ _Route24Text_51526:: ; 927a8 (24:67a8) cont "refuse!" done -_Route24Text_5152b:: ; 9288a (24:688a) +_Route24Text_5152b:: text "Arrgh!" line "You are good!" prompt -_Route24Text_51530:: ; 928a0 (24:68a0) +_Route24Text_51530:: text "With your ability," line "you could become" cont "a top leader in" cont "TEAM ROCKET!" done -_Route24BattleText1:: ; 928e2 (24:68e2) +_Route24BattleText1:: text "I saw your feat" line "from the grass!" done diff --git a/text/maps/route_24_2.asm b/text/maps/route_24_2.asm index 9a7613bb..12a8a59d 100644 --- a/text/maps/route_24_2.asm +++ b/text/maps/route_24_2.asm @@ -1,75 +1,75 @@ -_Route24EndBattleText1:: ; 94000 (25:4000) +_Route24EndBattleText1:: text "I" line "thought not!" prompt -_Route24AfterBattleText1:: ; 94010 (25:4010) +_Route24AfterBattleText1:: text "I hid because the" line "people on the" cont "bridge scared me!" done -_Route24BattleText2:: ; 94043 (25:4043) +_Route24BattleText2:: text "OK! I'm No. 5!" line "I'll stomp you!" done -_Route24EndBattleText2:: ; 94061 (25:4061) +_Route24EndBattleText2:: text "Whoa!" line "Too much!" prompt -_Route24AfterBattleText2:: ; 94072 (25:4072) +_Route24AfterBattleText2:: text "I did my best, I" line "have no regrets!" done -_Route24BattleText3:: ; 94095 (25:4095) +_Route24BattleText3:: text "I'm No. 4!" line "Getting tired?" done -_Route24EndBattleText3:: ; 940af (25:40af) +_Route24EndBattleText3:: text "I lost" line "too!" prompt -_Route24AfterBattleText3:: ; 940bc (25:40bc) +_Route24AfterBattleText3:: text "I did my best, so" line "I've no regrets!" done -_Route24BattleText4:: ; 940df (25:40df) +_Route24BattleText4:: text "Here's No. 3!" line "I won't be easy!" done -_Route24EndBattleText4:: ; 940fd (25:40fd) +_Route24EndBattleText4:: text "Ow!" line "Stomped flat!" prompt -_Route24AfterBattleText4:: ; 94110 (25:4110) +_Route24AfterBattleText4:: text "I did my best, I" line "have no regrets!" done -_Route24BattleText5:: ; 94133 (25:4133) +_Route24BattleText5:: text "I'm second!" line "Now it's serious!" done -_Route24EndBattleText5:: ; 94150 (25:4150) +_Route24EndBattleText5:: text "How could I" line "lose?" prompt -_Route24AfterBattleText5:: ; 94163 (25:4163) +_Route24AfterBattleText5:: text "I did my best, I" line "have no regrets!" done -_Route24BattleText6:: ; 94186 (25:4186) +_Route24BattleText6:: text "This is NUGGET" line "BRIDGE! Beat us 5" cont "trainers and win" @@ -79,12 +79,12 @@ _Route24BattleText6:: ; 94186 (25:4186) line "what it takes?" done -_Route24EndBattleText6:: ; 941e8 (25:41e8) +_Route24EndBattleText6:: text "Whoo!" line "Good stuff!" prompt -_Route24AfterBattleText6:: ; 941fb (25:41fb) +_Route24AfterBattleText6:: text "I did my best, I" line "have no regrets!" done diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm index d73611f2..b89396ea 100644 --- a/text/maps/route_25.asm +++ b/text/maps/route_25.asm @@ -1,191 +1,156 @@ -IF DEF(_YELLOW) -_Route25DamianText1:: - text "I'm not good at" - line "raising #MON." - - para "I should release" - line "my CHARMANDER" - cont "because I haven't" - cont "raised it well..." - - para "If you promise me" - line "you'll care for" - cont "it, it's yours." - done - -_Route25DamianText2:: - text "Take good care of" - line "my CHARMANDER!@@" - -_Route25DamianText3:: - text "Oh... I'd better" - line "release it then." - done - -_Route25DamianText4:: - text "How's CHARMANDER" - line "doing?" - done -ENDC - -_Route25BattleText1:: ; 9421e (25:421e) +_Route25BattleText1:: text "Local trainers" line "come here to" cont "practice!" done -_Route25EndBattleText1:: ; 94245 (25:4245) +_Route25EndBattleText1:: text "You're" line "decent." prompt -_Route25AfterBattleText1:: ; 94254 (25:4254) +_Route25AfterBattleText1:: text "All #MON have" line "weaknesses. It's" cont "best to raise" cont "different kinds." done -_Route25BattleText2:: ; 94292 (25:4292) +_Route25BattleText2:: text "Dad took me to a" line "great party on" cont "S.S.ANNE at" cont "VERMILION CITY!" done -_Route25EndBattleText2:: ; 942cf (25:42cf) +_Route25EndBattleText2:: text "I'm" line "not mad!" prompt -_Route25AfterBattleText2:: ; 942dc (25:42dc) +_Route25AfterBattleText2:: text "On S.S.ANNE, I" line "saw trainers from" cont "around the world." done -_Route25BattleText3:: ; 94310 (25:4310) +_Route25BattleText3:: text "I'm a cool guy." line "I've got a girl" cont "friend!" done -_Route25EndBattleText3:: ; 94337 (25:4337) +_Route25EndBattleText3:: text "Aww," line "darn..." prompt -_Route25AfterBattleText3:: ; 94345 (25:4345) +_Route25AfterBattleText3:: text "Oh well. My girl" line "will cheer me up." done -_Route25BattleText4:: ; 94369 (25:4369) +_Route25BattleText4:: text "Hi! My boy" line "friend is cool!" done -_Route25EndBattleText4:: ; 94385 (25:4385) -IF DEF(_YELLOW) - text "I'm in" - line "a slump!" -ELSE +_Route25EndBattleText4:: text "I was in" line "bad condition!" -ENDC prompt -_Route25AfterBattleText4:: ; 9439e (25:439e) +_Route25AfterBattleText4:: text "I wish my guy was" line "as good as you!" done -_Route25BattleText5:: ; 943c1 (25:43c1) +_Route25BattleText5:: text "I knew I had to" line "fight you!" done -_Route25EndBattleText5:: ; 943dd (25:43dd) +_Route25EndBattleText5:: text "I knew" line "I'd lose too!" prompt -_Route25AfterBattleText5:: ; 943f2 (25:43f2) +_Route25AfterBattleText5:: text "If your #MON" line "gets confused or" cont "falls asleep," cont "switch it!" done -_Route25BattleText6:: ; 9442a (25:442a) +_Route25BattleText6:: text "My friend has a" line "cute #MON." cont "I'm so jealous!" done -_Route25EndBattleText6:: ; 94455 (25:4455) +_Route25EndBattleText6:: text "I'm" line "not so jealous!" prompt -_Route25AfterBattleText6:: ; 94469 (25:4469) +_Route25AfterBattleText6:: text "You came from MT." line "MOON? May I have" cont "a CLEFAIRY?" done -_Route25BattleText7:: ; 94499 (25:4499) +_Route25BattleText7:: text "I just got down" line "from MT.MOON," cont "but I'm ready!" done -_Route25EndBattleText7:: ; 944c6 (25:44c6) +_Route25EndBattleText7:: text "You" line "worked hard!" prompt -_Route25AfterBattleText7:: ; 944d8 (25:44d8) +_Route25AfterBattleText7:: text "Drat!" line "A ZUBAT bit me" cont "back in there." done -_Route25BattleText8:: ; 944fd (25:44fd) +_Route25BattleText8:: text "I'm off to see a" line "#MON collector" cont "at the cape!" done -_Route25EndBattleText8:: ; 9452a (25:452a) +_Route25EndBattleText8:: text "You" line "got me." prompt -_Route25AfterBattleText8:: ; 94537 (25:4537) +_Route25AfterBattleText8:: text "The collector has" line "many rare kinds" cont "of #MON." done -_Route25BattleText9:: ; 94563 (25:4563) +_Route25BattleText9:: text "You're going to" line "see BILL? First," cont "let's fight!" done -_Route25EndBattleText9:: ; 94590 (25:4590) +_Route25EndBattleText9:: text "You're" line "something." prompt -_Route25AfterBattleText9:: ; 945a2 (25:45a2) +_Route25AfterBattleText9:: text "The trail below" line "is a shortcut to" cont "CERULEAN CITY." done -_Route25Text11:: ; 945d3 (25:45d3) +_Route25Text11:: text "SEA COTTAGE" line "BILL lives here!" done diff --git a/text/maps/route_2_gate.asm b/text/maps/route_2_gate.asm index e8337a1f..6be23d54 100644 --- a/text/maps/route_2_gate.asm +++ b/text/maps/route_2_gate.asm @@ -1,10 +1,10 @@ -_Route2GateText_5d616:: ; 8a7fc (22:67fc) +_Route2GateText_5d616:: text "The HM FLASH" line "lights even the" cont "darkest dungeons." done -_Route2GateText2:: ; 8a82c (22:682c) +_Route2GateText2:: text "Once a #MON" line "learns FLASH, you" cont "can get through" diff --git a/text/maps/route_2_house.asm b/text/maps/route_2_house.asm index 17028a2a..098a8f3e 100644 --- a/text/maps/route_2_house.asm +++ b/text/maps/route_2_house.asm @@ -1,4 +1,4 @@ -_Route2HouseText1:: ; 8a7b8 (22:67b8) +_Route2HouseText1:: text "A fainted #MON" line "can't fight. But, " cont "it can still use " diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm index 95612425..f9496c89 100644 --- a/text/maps/route_3.asm +++ b/text/maps/route_3.asm @@ -1,4 +1,4 @@ -_Route3Text1:: ; 8d779 (23:5779) +_Route3Text1:: text "Whew... I better" line "take a rest..." cont "Groan..." @@ -8,143 +8,138 @@ _Route3Text1:: ; 8d779 (23:5779) cont "lot out of you!" done -_Route3BattleText1:: ; 8d7d5 (23:57d5) +_Route3BattleText1:: text "Hey! I met you in" line "VIRIDIAN FOREST!" done -_Route3EndBattleText1:: ; 8d7f9 (23:57f9) +_Route3EndBattleText1:: text "You" line "beat me again!" prompt -_Route3AfterBattleText1:: ; 8d80d (23:580d) +_Route3AfterBattleText1:: text "There are other" line "kinds of #MON" cont "than those found" cont "in the forest!" done -_Route3BattleText2:: ; 8d84c (23:584c) +_Route3BattleText2:: text "Hi! I like shorts!" line "They're comfy and" cont "easy to wear!" done -_Route3EndBattleText2:: ; 8d87f (23:587f) +_Route3EndBattleText2:: text "I don't" line "believe it!" prompt -_Route3AfterBattleText2:: ; 8d893 (23:5893) +_Route3AfterBattleText2:: text "Are you storing" line "your #MON on" cont "PC? Each BOX can" cont "hold 20 #MON!" done -_Route3BattleText3:: ; 8d8d0 (23:58d0) +_Route3BattleText3:: text "You looked at me," line "didn't you?" done -_Route3EndBattleText3:: ; 8d8ee (23:58ee) +_Route3EndBattleText3:: text "You're" line "mean!" prompt -_Route3AfterBattleText3:: ; 8d8fb (23:58fb) +_Route3AfterBattleText3:: text "Quit staring if" line "you don't want to" cont "fight!" done -_Route3BattleText4:: ; 8d924 (23:5924) +_Route3BattleText4:: text "Are you a trainer?" line "Let's fight!" done -_Route3EndBattleText4:: ; 8d944 (23:5944) +_Route3EndBattleText4:: text "If I" -IF DEF(_YELLOW) - line "had new #MON," - cont "I would've won!" -ELSE line "had new #MON I" cont "would've won!" -ENDC prompt -_Route3AfterBattleText4:: ; 8d966 (23:5966) +_Route3AfterBattleText4:: text "If a #MON BOX" line "on the PC gets" cont "full, just switch" cont "to another BOX!" done -_Route3BattleText5:: ; 8d9a6 (23:59a6) +_Route3BattleText5:: text "That look you" line "gave me, it's so" cont "intriguing!" done -_Route3EndBattleText5:: ; 8d9d1 (23:59d1) +_Route3EndBattleText5:: text "Be nice!" prompt -_Route3AfterBattleText5:: ; 8d9db (23:59db) +_Route3AfterBattleText5:: text "Avoid fights by" line "not letting" cont "people see you!" done -_Route3BattleText6:: ; 8da08 (23:5a08) +_Route3BattleText6:: text "Hey! You're not" line "wearing shorts!" done -_Route3EndBattleText6:: ; 8da28 (23:5a28) +_Route3EndBattleText6:: text "Lost!" line "Lost! Lost!" prompt -_Route3AfterBattleText6:: ; 8da3b (23:5a3b) +_Route3AfterBattleText6:: text "I always wear" line "shorts, even in" cont "winter!" done -_Route3BattleText7:: ; 8da62 (23:5a62) +_Route3BattleText7:: text "You can fight my" line "new #MON!" done -_Route3EndBattleText7:: ; 8da7e (23:5a7e) +_Route3EndBattleText7:: text "Done" line "like dinner!" prompt -_Route3AfterBattleText7:: ; 8da91 (23:5a91) +_Route3AfterBattleText7:: text "Trained #MON" line "are stronger than" cont "the wild ones!" done -_Route3BattleText8:: ; 8dac0 (23:5ac0) +_Route3BattleText8:: text "Eek! Did you" line "touch me?" done -_Route3EndBattleText8:: ; 8dad8 (23:5ad8) +_Route3EndBattleText8:: text "That's it?" prompt -_Route3AfterBattleText8:: ; 8dae3 (23:5ae3) +_Route3AfterBattleText8:: text "ROUTE 4 is at the" line "foot of MT.MOON." done -_Route3Text10:: ; 8db07 (23:5b07) +_Route3Text10:: text "ROUTE 3" line "MT.MOON AHEAD" done diff --git a/text/maps/route_4.asm b/text/maps/route_4.asm index 15fced31..e49f1b7a 100644 --- a/text/maps/route_4.asm +++ b/text/maps/route_4.asm @@ -1,20 +1,20 @@ -_Route4Text1:: ; 8db1e (23:5b1e) +_Route4Text1:: text "Ouch! I tripped" line "over a rocky" cont "#MON, GEODUDE!" done -_Route4BattleText1:: ; 8db4b (23:5b4b) +_Route4BattleText1:: text "I came to get my" line "mushroom #MON!" done -_Route4EndBattleText1:: ; 8db6c (23:5b6c) +_Route4EndBattleText1:: text "Oh! My cute" line "mushroom #MON!" prompt -_Route4AfterBattleText1:: ; 8db88 (23:5b88) +_Route4AfterBattleText1:: text "There might not" line "be any more" cont "mushrooms here." @@ -23,12 +23,12 @@ _Route4AfterBattleText1:: ; 8db88 (23:5b88) line "them all." done -_Route4Text5:: ; 8dbcd (23:5bcd) +_Route4Text5:: text "MT.MOON" line "Tunnel Entrance" done -_Route4Text6:: ; 8dbe6 (23:5be6) +_Route4Text6:: text "ROUTE 4" line "MT.MOON -" cont "CERULEAN CITY" diff --git a/text/maps/route_5.asm b/text/maps/route_5.asm index dca94e1f..4fced687 100644 --- a/text/maps/route_5.asm +++ b/text/maps/route_5.asm @@ -1,4 +1,4 @@ -_Route5Text1:: ; 8dc07 (23:5c07) +_Route5Text1:: text "UNDERGROUND PATH" line "CERULEAN CITY -" cont "VERMILION CITY" diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm index 3a54f461..f98bcaf8 100644 --- a/text/maps/route_6.asm +++ b/text/maps/route_6.asm @@ -1,132 +1,96 @@ -IF DEF(_YELLOW) _Route6BattleText1:: - text "I'm doing this" - line "out of love." - cont "Leave me alone!" - done - -_Route6EndBattleText1:: - text "No," - line "this can't be..." - prompt - -_Route6AfterBattleText1:: - text "My love will leave" - line "me in disgust." - done - -_Route6BattleText2:: - text "I'm training for" - line "my love. Don't" - cont "bother me!" - done - -_Route6EndBattleText2:: - text "My" - line "textbook never..." - prompt - -_Route6AfterBattleText2:: - text "Now I understand," - line "#MON isn't" - cont "about calculated" - cont "numbers." - done -ELSE -_Route6BattleText1:: ; 8dc38 (23:5c38) text "Who's there?" line "Quit listening in" cont "on us!" done -_Route6EndBattleText1:: ; 8dc5e (23:5c5e) +_Route6EndBattleText1:: text "I" line "just can't win!" prompt -_Route6AfterBattleText1:: ; 8dc70 (23:5c70) +_Route6AfterBattleText1:: text "Whisper..." line "whisper..." done -_Route6BattleText2:: ; 8dc87 (23:5c87) +_Route6BattleText2:: text "Excuse me! This" line "is a private" cont "conversation!" done -_Route6EndBattleText2:: ; 8dcb3 (23:5cb3) +_Route6EndBattleText2:: text "Ugh!" line "I hate losing!" prompt -ENDC -_Route6BattleText3:: ; 8dcc8 (23:5cc8) +_Route6BattleText3:: text "There aren't many" line "bugs out here." done -_Route6EndBattleText3:: ; 8dce9 (23:5ce9) +_Route6EndBattleText3:: text "No!" line "You're kidding!" prompt -_Route6AfterBattleText3:: ; 8dcfd (23:5cfd) +_Route6AfterBattleText3:: text "I like bugs, so" line "I'm going back to" cont "VIRIDIAN FOREST." done -_Route6BattleText4:: ; 8dd30 (23:5d30) +_Route6BattleText4:: text "Huh? You want" line "to talk to me?" done -_Route6EndBattleText4:: ; 8dd4e (23:5d4e) +_Route6EndBattleText4:: text "I" line "didn't start it!" prompt -_Route6AfterBattleText4:: ; 8dd61 (23:5d61) +_Route6AfterBattleText4:: text "I should carry" line "more #MON with" cont "me for safety." done -_Route6BattleText5:: ; 8dd8f (23:5d8f) +_Route6BattleText5:: text "Me? Well, OK." line "I'll play!" done -_Route6EndBattleText5:: ; 8dda8 (23:5da8) +_Route6EndBattleText5:: text "Just" line "didn't work!" prompt -_Route6AfterBattleText5:: ; 8ddba (23:5dba) +_Route6AfterBattleText5:: text "I want to get" line "stronger! What's" cont "your secret?" done -_Route6BattleText6:: ; 8dde6 (23:5de6) +_Route6BattleText6:: text "I've never seen" line "you around!" cont "Are you good?" done -_Route6EndBattleText6:: ; 8de10 (23:5e10) +_Route6EndBattleText6:: text "You" line "are too good!" prompt -_Route6AfterBattleText6:: ; 8de23 (23:5e23) +_Route6AfterBattleText6:: text "Are my #MON" line "weak? Or, am I" cont "just bad?" done -_Route6Text7:: ; 8de49 (23:5e49) +_Route6Text7:: text "UNDERGROUND PATH" line "CERULEAN CITY -" cont "VERMILION CITY" diff --git a/text/maps/route_7.asm b/text/maps/route_7.asm index 77c0eb79..24645b90 100644 --- a/text/maps/route_7.asm +++ b/text/maps/route_7.asm @@ -1,4 +1,4 @@ -_Route7Text1:: ; 8de7a (23:5e7a) +_Route7Text1:: text "UNDERGROUND PATH" line "CELADON CITY -" cont "LAVENDER TOWN" diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm index 62e2aff3..f59feb87 100644 --- a/text/maps/route_8.asm +++ b/text/maps/route_8.asm @@ -1,157 +1,153 @@ -_Route8BattleText1:: ; 8dea9 (23:5ea9) +_Route8BattleText1:: text "You look good at" line "#MON, but" cont "how's your chem?" done -_Route8EndBattleText1:: ; 8ded5 (23:5ed5) +_Route8EndBattleText1:: text "Ow!" line "Meltdown!" prompt -_Route8AfterBattleText1:: ; 8dee4 (23:5ee4) +_Route8AfterBattleText1:: text "I am better at" line "school than this!" done -_Route8BattleText2:: ; 8df06 (23:5f06) +_Route8BattleText2:: text "All right! Let's" line "roll the dice!" done -_Route8EndBattleText2:: ; 8df26 (23:5f26) +_Route8EndBattleText2:: text "Drat!" line "Came up short!" prompt -_Route8AfterBattleText2:: ; 8df3c (23:5f3c) +_Route8AfterBattleText2:: text "Lady Luck's not" line "with me today!" done -_Route8BattleText3:: ; 8df5b (23:5f5b) +_Route8BattleText3:: text "You need strategy" line "to win at this!" done -_Route8EndBattleText3:: ; 8df7e (23:5f7e) +_Route8EndBattleText3:: text "It's" line "not logical!" prompt -_Route8AfterBattleText3:: ; 8df90 (23:5f90) +_Route8AfterBattleText3:: text "Go with GRIMER" line "first...and..." cont "...and...then..." done -_Route8BattleText4:: ; 8dfc0 (23:5fc0) +_Route8BattleText4:: text "I like NIDORAN, so" line "I collect them!" done -_Route8EndBattleText4:: ; 8dfe4 (23:5fe4) +_Route8EndBattleText4:: text "Why? Why??" prompt -_Route8AfterBattleText4:: ; 8dff0 (23:5ff0) +_Route8AfterBattleText4:: text "When #MON grow" line "up they get ugly!" cont "They shouldn't" cont "evolve!" done -_Route8BattleText5:: ; 8e028 (23:6028) +_Route8BattleText5:: text "School is fun, but" line "so are #MON." done -_Route8EndBattleText5:: ; 8e049 (23:6049) +_Route8EndBattleText5:: text "I'll" line "stay with school." prompt -_Route8AfterBattleText5:: ; 8e060 (23:6060) +_Route8AfterBattleText5:: text "We're stuck here" line "because of the" cont "gates at SAFFRON." done -_Route8BattleText6:: ; 8e092 (23:6092) +_Route8BattleText6:: text "MEOWTH is so cute," line "meow, meow, meow!" done -_Route8EndBattleText6:: ; 8e0b8 (23:60b8) +_Route8EndBattleText6:: text "Meow!" prompt -_Route8AfterBattleText6:: ; 8e0bf (23:60bf) +_Route8AfterBattleText6:: text "I think PIDGEY" line "and RATTATA" cont "are cute too!" done -_Route8BattleText7:: ; 8e0e9 (23:60e9) +_Route8BattleText7:: text "We must look" line "silly standing" cont "here like this!" done -_Route8EndBattleText7:: ; 8e116 (23:6116) +_Route8EndBattleText7:: text "Look what" line "you did!" prompt -_Route8AfterBattleText7:: ; 8e12a (23:612a) -if DEF(_YELLOW) - text "SAFFRON's gate-" -ELSE +_Route8AfterBattleText7:: text "SAFFRON's gate" -ENDC line "keeper won't let" cont "us through." cont "He's so mean!" done -_Route8BattleText8:: ; 8e162 (23:6162) +_Route8BattleText8:: text "I'm a rambling," line "gambling dude!" done -_Route8EndBattleText8:: ; 8e181 (23:6181) +_Route8EndBattleText8:: text "Missed" line "the big score!" prompt -_Route8AfterBattleText8:: ; 8e198 (23:6198) +_Route8AfterBattleText8:: text "Gambling and" line "#MON are like" cont "eating peanuts!" cont "Just can't stop!" done -_Route8BattleText9:: ; 8e1d4 (23:61d4) +_Route8BattleText9:: text "What's a cute," line "round and fluffy" cont "#MON?" done -_Route8EndBattleText9:: ; 8e1fa (23:61fa) +_Route8EndBattleText9:: text "Stop!" para "Don't be so mean" line "to my CLEFAIRY!" prompt -_Route8AfterBattleText9:: ; 8e221 (23:6221) +_Route8AfterBattleText9:: text "I heard that" line "CLEFAIRY evolves" cont "when it's exposed" cont "to a MOON STONE." done -_Route8Text10:: ; 8e262 (23:6262) +_Route8Text10:: text "UNDERGROUND PATH" line "CELADON CITY -" cont "LAVENDER TOWN" diff --git a/text/maps/route_9.asm b/text/maps/route_9.asm index 353eb779..c440eca9 100644 --- a/text/maps/route_9.asm +++ b/text/maps/route_9.asm @@ -1,91 +1,74 @@ -_Route9BattleText1:: ; 8e291 (23:6291) +_Route9BattleText1:: text "You have #MON" line "with you!" cont "You're mine!" done -_Route9EndBattleText1:: ; 8e2b6 (23:62b6) +_Route9EndBattleText1:: text "You" line "deceived me!" prompt -_Route9AfterBattleText1:: ; 8e2c8 (23:62c8) +_Route9AfterBattleText1:: text "You need light to" line "get through that" cont "dark tunnel ahead." done -IF DEF(_YELLOW) -_Route9BattleTextAJ:: - text "I aim to be the" - line "ultimate trainer!" - done - -_Route9EndBattleTextAJ:: - text "My" - line "SANDSHREW lost?" - prompt - -_Route9AfterBattleTextAJ:: - text "I'll restart my" - line "100-win streak" - cont "with SANDSHREW." -ENDC - -_Route9BattleText2:: ; 8e2ff (23:62ff) +_Route9BattleText2:: text "Who's that walking" line "with those good" cont "looking #MON?" done -_Route9EndBattleText2:: ; 8e330 (23:6330) +_Route9EndBattleText2:: text "Out" line "like a light!" prompt -_Route9AfterBattleText2:: ; 8e343 (23:6343) +_Route9AfterBattleText2:: text "Keep walking!" done -_Route9BattleText3:: ; 8e352 (23:6352) +_Route9BattleText3:: text "I'm taking ROCK" line "TUNNEL to go to" cont "LAVENDER..." done -_Route9EndBattleText3:: ; 8e37e (23:637e) +_Route9EndBattleText3:: text "Can't" line "measure up!" prompt -_Route9AfterBattleText3:: ; 8e390 (23:6390) +_Route9AfterBattleText3:: text "Are you off to" line "ROCK TUNNEL too?" done -_Route9BattleText4:: ; 8e3b1 (23:63b1) +_Route9BattleText4:: text "Don't you dare" line "condescend me!" done -_Route9EndBattleText4:: ; 8e3cf (23:63cf) +_Route9EndBattleText4:: text "No!" line "You're too much!" prompt -_Route9AfterBattleText4:: ; 8e3e4 (23:63e4) +_Route9AfterBattleText4:: text "You're obviously" line "talented! Good" cont "luck to you!" done -_Route9BattleText5:: ; 8e411 (23:6411) +_Route9BattleText5:: text "Bwahaha!" line "Great! I was" cont "bored, eh!" done -_Route9EndBattleText5:: ; 8e433 (23:6433) +_Route9EndBattleText5:: text "Keep it" line "coming, eh!" @@ -93,81 +76,81 @@ _Route9EndBattleText5:: ; 8e433 (23:6433) line "of #MON!" prompt -_Route9AfterBattleText5:: ; 8e461 (23:6461) +_Route9AfterBattleText5:: text "You sure had guts" line "standing up to me" cont "there, eh?" done -_Route9BattleText6:: ; 8e491 (23:6491) +_Route9BattleText6:: text "Hahaha!" line "Aren't you a" cont "little toughie!" done -_Route9EndBattleText6:: ; 8e4b6 (23:64b6) +_Route9EndBattleText6:: text "What's" line "that?" prompt -_Route9AfterBattleText6:: ; 8e4c3 (23:64c3) +_Route9AfterBattleText6:: text "Hahaha! Kids" line "should be tough!" done -_Route9BattleText7:: ; 8e4e2 (23:64e2) +_Route9BattleText7:: text "I got up early" line "every day to" cont "raise my #MON" cont "from cocoons!" done -_Route9EndBattleText7:: ; 8e51b (23:651b) +_Route9EndBattleText7:: text "WHAT?" para "What a total" line "waste of time!" prompt -_Route9AfterBattleText7:: ; 8e53e (23:653e) +_Route9AfterBattleText7:: text "I have to collect" line "more than bugs to" cont "get stronger..." done -_Route9BattleText8:: ; 8e573 (23:6573) +_Route9BattleText8:: text "Hahahaha!" line "Come on, dude!" done -_Route9EndBattleText8:: ; 8e58d (23:658d) +_Route9EndBattleText8:: text "Hahahaha!" line "You beat me fair!" prompt -_Route9AfterBattleText8:: ; 8e5aa (23:65aa) +_Route9AfterBattleText8:: text "Hahahaha!" line "Us hearty guys" cont "always laugh!" done -_Route9BattleText9:: ; 8e5d2 (23:65d2) +_Route9BattleText9:: text "Go, my super bug" line "#MON!" done -_Route9EndBattleText9:: ; 8e5ea (23:65ea) +_Route9EndBattleText9:: text "My" line "bugs..." prompt -_Route9AfterBattleText9:: ; 8e5f6 (23:65f6) +_Route9AfterBattleText9:: text "If you don't like" line "bug #MON, you" cont "bug me!" done -_Route9Text11:: ; 8e61e (23:661e) +_Route9Text11:: text "ROUTE 9" line "CERULEAN CITY-" cont "ROCK TUNNEL" diff --git a/text/maps/safari_zone_center.asm b/text/maps/safari_zone_center.asm index e12d495f..50ed1e1e 100644 --- a/text/maps/safari_zone_center.asm +++ b/text/maps/safari_zone_center.asm @@ -1,8 +1,8 @@ -_SafariZoneCenterText2:: ; 85807 (21:5807) +_SafariZoneCenterText2:: text "REST HOUSE" done -_SafariZoneCenterText3:: ; 85813 (21:5813) +_SafariZoneCenterText3:: text "TRAINER TIPS" para "Press the START" diff --git a/text/maps/safari_zone_east.asm b/text/maps/safari_zone_east.asm index 0658a09f..78634e4a 100644 --- a/text/maps/safari_zone_east.asm +++ b/text/maps/safari_zone_east.asm @@ -1,8 +1,8 @@ -_SafariZoneEastText5:: ; 855e0 (21:55e0) +_SafariZoneEastText5:: text "REST HOUSE" done -_SafariZoneEastText6:: ; 855ec (21:55ec) +_SafariZoneEastText6:: text "TRAINER TIPS" para "The remaining time" @@ -10,7 +10,7 @@ _SafariZoneEastText6:: ; 855ec (21:55ec) cont "while you walk!" done -_SafariZoneEastText7:: ; 8562b (21:562b) +_SafariZoneEastText7:: text "CENTER AREA" line "NORTH: AREA 2" done diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm index 79f70ea4..22c179f3 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/safari_zone_entrance.asm @@ -1,9 +1,9 @@ -_SafariZoneEntranceText1:: ; 9e6c7 (27:66c7) +_SafariZoneEntranceText1:: text "Welcome to the" line "SAFARI ZONE!" done -SafariZoneEntranceText_9e6e4:: ; 9e6e4 (27:66e4) +SafariZoneEntranceText_9e6e4:: text "For just ¥500," line "you can catch all" cont "the #MON you" @@ -12,7 +12,7 @@ SafariZoneEntranceText_9e6e4:: ; 9e6e4 (27:66e4) para "Would you like to" line "join the hunt?@@" -SafariZoneEntranceText_9e747:: ; 9e747 (27:6747) +SafariZoneEntranceText_9e747:: text "That'll be ¥500" line "please!" @@ -23,7 +23,7 @@ SafariZoneEntranceText_9e747:: ; 9e747 (27:6747) para $52, " received" line "30 SAFARI BALLs!@@" -_SafariZoneEntranceText_75360:: ; 9e79f (27:679f) +_SafariZoneEntranceText_75360:: db $0 para "We'll call you on" line "the PA when you" @@ -31,41 +31,41 @@ _SafariZoneEntranceText_75360:: ; 9e79f (27:679f) cont "or SAFARI BALLs!" done -_SafariZoneEntranceText_75365:: ; 9e7e3 (27:67e3) +_SafariZoneEntranceText_75365:: text "OK! Please come" line "again!" done -_SafariZoneEntranceText_7536a:: ; 9e7fb (27:67fb) +_SafariZoneEntranceText_7536a:: text "Oops! Not enough" line "money!" done -SafariZoneEntranceText_9e814:: ; 9e814 (27:6814) +SafariZoneEntranceText_9e814:: text "Leaving early?@@" -_SafariZoneEntranceText_753bb:: ; 9e825 (27:6825) +_SafariZoneEntranceText_753bb:: text "Please return any" line "SAFARI BALLs you" cont "have left." done -_SafariZoneEntranceText_753c0:: ; 9e854 (27:6854) +_SafariZoneEntranceText_753c0:: text "Good Luck!" done -_SafariZoneEntranceText_753c5:: ; 9e860 (27:6860) +_SafariZoneEntranceText_753c5:: text "Did you get a" line "good haul?" cont "Come again!" done -_SafariZoneEntranceText_753e6:: ; 9e886 (27:6886) +_SafariZoneEntranceText_753e6:: text "Hi! Is it your" line "first time here?" done -_SafariZoneEntranceText_753eb:: ; 9e8a7 (27:68a7) +_SafariZoneEntranceText_753eb:: text "SAFARI ZONE has 4" line "zones in it." @@ -87,7 +87,7 @@ _SafariZoneEntranceText_753eb:: ; 9e8a7 (27:68a7) cont "new #MON!" done -_SafariZoneEntranceText_753f0:: ; 9e993 (27:6993) +_SafariZoneEntranceText_753f0:: text "Sorry, you're a" line "regular here!" done diff --git a/text/maps/safari_zone_north.asm b/text/maps/safari_zone_north.asm index cdd46333..fdf8b5e8 100644 --- a/text/maps/safari_zone_north.asm +++ b/text/maps/safari_zone_north.asm @@ -1,19 +1,19 @@ -_SafariZoneNorthText3:: ; 85646 (21:5646) +_SafariZoneNorthText3:: text "REST HOUSE" done -_SafariZoneNorthText4:: ; 85652 (21:5652) +_SafariZoneNorthText4:: text "TRAINER TIPS" para "The SECRET HOUSE" line "is still ahead!" done -_SafariZoneNorthText5:: ; 85681 (21:5681) +_SafariZoneNorthText5:: text "AREA 2" done -_SafariZoneNorthText6:: ; 85689 (21:5689) +_SafariZoneNorthText6:: text "TRAINER TIPS" para "#MON hide in" @@ -24,7 +24,7 @@ _SafariZoneNorthText6:: ; 85689 (21:5689) cont "flush them out." done -_SafariZoneNorthText7:: ; 856df (21:56df) +_SafariZoneNorthText7:: text "TRAINER TIPS" para "Win a free HM for" diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/safari_zone_rest_house_1.asm index 7fc2d027..2731bdb4 100644 --- a/text/maps/safari_zone_rest_house_1.asm +++ b/text/maps/safari_zone_rest_house_1.asm @@ -1,10 +1,10 @@ -_SafariZoneRestHouse1Text1:: ; 85851 (21:5851) +_SafariZoneRestHouse1Text1:: text "SARA: Where did" line "my boy friend," cont "ERIK, go?" done -_SafariZoneRestHouse1Text2:: ; 8587b (21:587b) +_SafariZoneRestHouse1Text2:: text "I'm catching" line "#MON to take" cont "home as gifts!" diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/safari_zone_rest_house_2.asm index a93838bb..6cdca9c0 100644 --- a/text/maps/safari_zone_rest_house_2.asm +++ b/text/maps/safari_zone_rest_house_2.asm @@ -1,4 +1,4 @@ -_SafariZoneRestHouse2Text1:: ; 85a2f (21:5a2f) +_SafariZoneRestHouse2Text1:: text "Tossing ROCKs at" line "#MON might" cont "make them run," @@ -6,13 +6,13 @@ _SafariZoneRestHouse2Text1:: ; 85a2f (21:5a2f) cont "easier to catch." done -_SafariZoneRestHouse2Text2:: ; 85a7a (21:5a7a) +_SafariZoneRestHouse2Text2:: text "Using BAIT will" line "make #MON" cont "easier to catch." done -_SafariZoneRestHouse2Text3:: ; 85aa6 (21:5aa6) +_SafariZoneRestHouse2Text3:: text "I hiked a lot, but" line "I didn't see any" cont "#MON I wanted." diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/safari_zone_rest_house_3.asm index c424014a..f40c3009 100644 --- a/text/maps/safari_zone_rest_house_3.asm +++ b/text/maps/safari_zone_rest_house_3.asm @@ -1,10 +1,10 @@ -_SafariZoneRestHouse3Text1:: ; 85ad9 (21:5ad9) +_SafariZoneRestHouse3Text1:: text "How many did you" line "catch? I'm bushed" cont "from the work!" done -_SafariZoneRestHouse3Text2:: ; 85b0b (21:5b0b) +_SafariZoneRestHouse3Text2:: text "I caught a" line "CHANSEY!" @@ -12,7 +12,7 @@ _SafariZoneRestHouse3Text2:: ; 85b0b (21:5b0b) line "all worthwhile!" done -_SafariZoneRestHouse3Text3:: ; 85b40 (21:5b40) +_SafariZoneRestHouse3Text3:: text "Whew! I'm tired" line "from all the fun!" done diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/safari_zone_rest_house_4.asm index 1b510bd8..e50c4522 100644 --- a/text/maps/safari_zone_rest_house_4.asm +++ b/text/maps/safari_zone_rest_house_4.asm @@ -1,4 +1,4 @@ -_SafariZoneRestHouse4Text1:: ; 85b62 (21:5b62) +_SafariZoneRestHouse4Text1:: text "You can keep any" line "item you find on" cont "the ground here." @@ -9,14 +9,14 @@ _SafariZoneRestHouse4Text1:: ; 85b62 (21:5b62) cont "of them at once!" done -_SafariZoneRestHouse4Text2:: ; 85bd5 (21:5bd5) +_SafariZoneRestHouse4Text2:: text "Go to the deepest" line "part of the" cont "SAFARI ZONE. You" cont "will win a prize!" done -_SafariZoneRestHouse4Text3:: ; 85c17 (21:5c17) +_SafariZoneRestHouse4Text3:: text "My EEVEE evolved" line "into FLAREON!" diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm index 67b677be..f285a697 100644 --- a/text/maps/safari_zone_secret_house.asm +++ b/text/maps/safari_zone_secret_house.asm @@ -1,4 +1,4 @@ -_SecretHouseText_4a350:: ; 858a4 (21:58a4) +_SecretHouseText_4a350:: text "Ah! Finally!" para "You're the first" @@ -14,13 +14,13 @@ _SecretHouseText_4a350:: ; 858a4 (21:58a4) line "You have won!" prompt -_ReceivedHM03Text:: ; 85943 (21:5943) +_ReceivedHM03Text:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_HM03ExplanationText:: ; 85957 (21:5957) +_HM03ExplanationText:: text "HM03 is SURF!" para "#MON will be" @@ -37,7 +37,7 @@ _HM03ExplanationText:: ; 85957 (21:5957) cont "fabulous prize!" done -_HM03NoRoomText:: ; 85a02 (21:5a02) +_HM03NoRoomText:: text "You don't have" line "room for this" cont "fabulous prize!" diff --git a/text/maps/safari_zone_west.asm b/text/maps/safari_zone_west.asm index ea8d2425..e10df2a3 100644 --- a/text/maps/safari_zone_west.asm +++ b/text/maps/safari_zone_west.asm @@ -1,8 +1,8 @@ -_SafariZoneWestText5:: ; 85719 (21:5719) +_SafariZoneWestText5:: text "REST HOUSE" done -_SafariZoneWestText6:: ; 85725 (21:5725) +_SafariZoneWestText6:: text "REQUEST NOTICE" para "Please find the" @@ -15,7 +15,7 @@ _SafariZoneWestText6:: ; 85725 (21:5725) line "Contact: WARDEN" done -_SafariZoneWestText7:: ; 857a3 (21:57a3) +_SafariZoneWestText7:: text "TRAINER TIPS" para "Zone Exploration" @@ -25,7 +25,7 @@ _SafariZoneWestText7:: ; 857a3 (21:57a3) line "the SECRET HOUSE!" done -_SafariZoneWestText8:: ; 857ed (21:57ed) +_SafariZoneWestText8:: text "AREA 3" line "EAST: CENTER AREA" done diff --git a/text/maps/saffron_city.asm b/text/maps/saffron_city.asm index cc2c684e..82687181 100644 --- a/text/maps/saffron_city.asm +++ b/text/maps/saffron_city.asm @@ -1,60 +1,60 @@ -_SaffronCityText1:: ; a62e7 (29:62e7) +_SaffronCityText1:: text "What do you want?" line "Get lost!" done -_SaffronCityText2:: ; a6304 (29:6304) +_SaffronCityText2:: text "BOSS said he'll" line "take this town!" done -_SaffronCityText3:: ; a6324 (29:6324) +_SaffronCityText3:: text "Get out of the" line "way!" done -_SaffronCityText4:: ; a6339 (29:6339) +_SaffronCityText4:: text "SAFFRON belongs" line "to TEAM ROCKET!" done -_SaffronCityText5:: ; a635a (29:635a) +_SaffronCityText5:: text "Being evil makes" line "me feel so alive!" done -_SaffronCityText6:: ; a637e (29:637e) +_SaffronCityText6:: text "Ow! Watch where" line "you're walking!" done -_SaffronCityText7:: ; a639e (29:639e) +_SaffronCityText7:: text "With SILPH under" line "control, we can" cont "exploit #MON" cont "around the world!" done -_SaffronCityText8:: ; a63df (29:63df) +_SaffronCityText8:: text "You beat TEAM" line "ROCKET all alone?" cont "That's amazing!" done -_SaffronCityText9:: ; a640f (29:640f) +_SaffronCityText9:: text "Yeah! TEAM ROCKET" line "is gone!" cont "It's safe to go" cont "out again!" done -_SaffronCityText10:: ; a6445 (29:6445) +_SaffronCityText10:: text "People should be" line "flocking back to" cont "SAFFRON now." done -_SaffronCityText11:: ; a6475 (29:6475) +_SaffronCityText11:: text "I flew here on my" line "PIDGEOT when I" cont "read about SILPH." @@ -64,16 +64,16 @@ _SaffronCityText11:: ; a6475 (29:6475) cont "media action." done -_SaffronCityText12:: ; a64d6 (29:64d6) +_SaffronCityText12:: text "PIDGEOT: Bi bibii!@@" -_SaffronCityText13:: ; a64eb (29:64eb) +_SaffronCityText13:: text "I saw ROCKET" line "BOSS escaping" cont "SILPH's building." done -_SaffronCityText14:: ; a6518 (29:6518) +_SaffronCityText14:: text "I'm a security" line "guard." @@ -81,7 +81,7 @@ _SaffronCityText14:: ; a6518 (29:6518) line "don't allow in!" done -_SaffronCityText15:: ; a654f (29:654f) +_SaffronCityText15:: text "..." line "Snore..." @@ -89,17 +89,17 @@ _SaffronCityText15:: ; a654f (29:654f) line "a snooze!" done -_SaffronCityText16:: ; a6577 (29:6577) +_SaffronCityText16:: text "SAFFRON CITY" line "Shining, Golden" cont "Land of Commerce" done -_SaffronCityText17:: ; a65a6 (29:65a6) +_SaffronCityText17:: text "FIGHTING DOJO" done -_SaffronCityText18:: ; a65b5 (29:65b5) +_SaffronCityText18:: text "SAFFRON CITY" line "#MON GYM" cont "LEADER: SABRINA" @@ -108,7 +108,7 @@ _SaffronCityText18:: ; a65b5 (29:65b5) line "Psychic #MON!" done -_SaffronCityText20:: ; a65f8 (29:65f8) +_SaffronCityText20:: text "TRAINER TIPS" para "FULL HEAL cures" @@ -120,7 +120,7 @@ _SaffronCityText20:: ; a65f8 (29:65f8) cont "more convenient." done -_SaffronCityText21:: ; a6667 (29:6667) +_SaffronCityText21:: text "TRAINER TIPS" para "New GREAT BALL" @@ -132,17 +132,17 @@ _SaffronCityText21:: ; a6667 (29:6667) cont "#MON." done -_SaffronCityText22:: ; a66c7 (29:66c7) +_SaffronCityText22:: text "SILPH CO." line "OFFICE BUILDING" done -_SaffronCityText24:: ; a66e2 (29:66e2) +_SaffronCityText24:: text "MR.PSYCHIC's" line "HOUSE" done -_SaffronCityText25:: ; a66f5 (29:66f5) +_SaffronCityText25:: text "SILPH's latest" line "product!" diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm index b7db1751..30ad6cbd 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/saffron_gates.asm @@ -1,17 +1,13 @@ -_SaffronGateText_1dfe7:: ; 8aa5c (22:6a5c) +_SaffronGateText_1dfe7:: text "I'm on guard duty." line "Gee, I'm thirsty," cont "though!" -IF DEF(_YELLOW) - para "Oh, wait there," -ELSE para "Oh wait there," -ENDC line "the road's closed." done -_SaffronGateText_8aaa9:: ; 8aaa9 (22:6aa9) +_SaffronGateText_8aaa9:: text "Whoa, boy!" line "I'm parched!" cont "..." @@ -19,14 +15,10 @@ _SaffronGateText_8aaa9:: ; 8aaa9 (22:6aa9) cont "this drink?" cont "Gee, thanks!@@" -_SaffronGateText_1dff1:: ; 8aaef (22:6aef) +_SaffronGateText_1dff1:: db $0 para "..." -IF DEF(_YELLOW) - line "Glug, glug..." -ELSE line "Glug glug..." -ENDC cont "..." cont "Gulp..." cont "If you want to go" @@ -38,7 +30,7 @@ ENDC cont "the other guards!" done -_SaffronGateText_1dff6:: ; 8ab74 (22:6b74) +_SaffronGateText_1dff6:: text "Hi, thanks for" line "the cool drinks!" done diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm index 3236c7b2..f44baaea 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/saffron_gym.asm @@ -1,4 +1,4 @@ -_SaffronGymText_5d162:: ; a1bb4 (28:5bb4) +_SaffronGymText_5d162:: text "I had a vision of" line "your arrival!" @@ -16,7 +16,7 @@ _SaffronGymText_5d162:: ; a1bb4 (28:5bb4) cont "you my powers!" done -_SaffronGymText_5d167:: ; a1c73 (28:5c73) +_SaffronGymText_5d167:: text "I'm" line "shocked!" cont "But, a loss is a" @@ -29,14 +29,14 @@ _SaffronGymText_5d167:: ; a1c73 (28:5c73) para "You earned the" line "MARSHBADGE!@@" -_SaffronGymText_5d16e:: ; a1cdc (28:5cdc) +_SaffronGymText_5d16e:: text "Everyone has" line "psychic power!" cont "People just don't" cont "realize it!" done -_SaffronGymText_5d173:: ; a1d16 (28:5d16) +_SaffronGymText_5d173:: text "The MARSHBADGE" line "makes #MON up" cont "to L70 obey you!" @@ -54,11 +54,11 @@ _SaffronGymText_5d173:: ; a1d16 (28:5d16) line "this TM with you!" done -ReceivedTM46Text:: ; a1dcd (28:5dcd) +ReceivedTM46Text:: text $52, " received" line "TM46!@@" -_TM46ExplanationText:: ; a1de0 (28:5de0) +_TM46ExplanationText:: db $0 para "TM46 is PSYWAVE!" line "It uses powerful" @@ -66,12 +66,12 @@ _TM46ExplanationText:: ; a1de0 (28:5de0) cont "inflict damage!" done -_TM46NoRoomText:: ; a1e25 (28:5e25) +_TM46NoRoomText:: text "Your pack is full" line "of other items!" done -_SaffronGymText_5d1e6:: ; a1e48 (28:5e48) +_SaffronGymText_5d1e6:: text "Yo! Champ in" line "making!" @@ -88,7 +88,7 @@ _SaffronGymText_5d1e6:: ; a1e48 (28:5e48) cont "even aim a punch!" done -_SaffronGymText_5d1eb:: ; a1ef0 (28:5ef0) +_SaffronGymText_5d1eb:: text "Psychic power," line "huh?" @@ -97,18 +97,18 @@ _SaffronGymText_5d1eb:: ; a1ef0 (28:5ef0) cont "at the slots!" done -_SaffronGymBattleText1:: ; a1f33 (28:5f33) +_SaffronGymBattleText1:: text "SABRINA is younger" line "than I, but I" cont "respect her!" done -_SaffronGymEndBattleText1:: ; a1f62 (28:5f62) +_SaffronGymEndBattleText1:: text "Not" line "good enough!" prompt -_SaffronGymAfterBattleText1:: ; a1f74 (28:5f74) +_SaffronGymAfterBattleText1:: text "In a battle of" line "equals, the one" cont "with the stronger" @@ -119,27 +119,23 @@ _SaffronGymAfterBattleText1:: ; a1f74 (28:5f74) cont "focus on winning!" done -_SaffronGymBattleText2:: ; a1fe0 (28:5fe0) +_SaffronGymBattleText2:: text "Does our unseen" line "power scare you?" done -_SaffronGymEndBattleText2:: ; a2002 (28:6002) +_SaffronGymEndBattleText2:: text "I never" line "foresaw this!" prompt -_SaffronGymAfterBattleText2:: ; a2019 (28:6019) +_SaffronGymAfterBattleText2:: text "Psychic #MON" -IF DEF(_YELLOW) - line "fear only bugs!" -ELSE line "fear only ghosts" cont "and bugs!" -ENDC done -_SaffronGymBattleText3:: ; a2042 (28:6042) +_SaffronGymBattleText3:: text "#MON take on" line "the appearance of" cont "their trainers." @@ -148,52 +144,52 @@ _SaffronGymBattleText3:: ; a2042 (28:6042) line "be tough, then!" done -_SaffronGymEndBattleText3:: ; a2091 (28:6091) +_SaffronGymEndBattleText3:: text "I knew" line "it!" prompt -_SaffronGymAfterBattleText3:: ; a209d (28:609d) +_SaffronGymAfterBattleText3:: text "I must teach" line "better techniques" cont "to my #MON!" done -_SaffronGymBattleText4:: ; a20c9 (28:60c9) +_SaffronGymBattleText4:: text "You know that" line "power alone isn't" cont "enough!" done -_SaffronGymEndBattleText4:: ; a20f1 (28:60f1) +_SaffronGymEndBattleText4:: text "I don't" line "believe this!" prompt -_SaffronGymAfterBattleText4:: ; a2107 (28:6107) +_SaffronGymAfterBattleText4:: text "SABRINA just wiped" line "out the KARATE" cont "MASTER next door!" done -_SaffronGymBattleText5:: ; a213c (28:613c) +_SaffronGymBattleText5:: text "You and I, our" line "#MON shall" cont "fight!" done -_SaffronGymEndBattleText5:: ; a215e (28:615e) +_SaffronGymEndBattleText5:: text "I lost" line "after all!" prompt -_SaffronGymAfterBattleText5:: ; a2171 (28:6171) +_SaffronGymAfterBattleText5:: text "I knew that this" line "was going to take" cont "place." done -_SaffronGymBattleText6:: ; a219c (28:619c) +_SaffronGymBattleText6:: text "SABRINA is young," line "but she's also" cont "our LEADER!" @@ -202,12 +198,12 @@ _SaffronGymBattleText6:: ; a219c (28:619c) line "her easily!" done -_SaffronGymEndBattleText6:: ; a21e4 (28:61e4) +_SaffronGymEndBattleText6:: text "I lost" line "my concentration!" prompt -_SaffronGymAfterBattleText6:: ; a21fe (28:61fe) +_SaffronGymAfterBattleText6:: text "There used to be" line "2 #MON GYMs in" cont "SAFFRON." @@ -219,7 +215,7 @@ _SaffronGymAfterBattleText6:: ; a21fe (28:61fe) cont "creamed them!" done -_SaffronGymBattleText7:: ; a2277 (28:6277) +_SaffronGymBattleText7:: text "SAFFRON #MON" line "GYM is famous for" cont "its psychics!" @@ -229,11 +225,11 @@ _SaffronGymBattleText7:: ; a2277 (28:6277) cont "I can tell!" done -_SaffronGymEndBattleText7:: ; a22ca (28:62ca) +_SaffronGymEndBattleText7:: text "Arrrgh!" prompt -_SaffronGymAfterBattleText7:: ; a22d3 (28:62d3) +_SaffronGymAfterBattleText7:: text "That's right! I" line "used telepathy to" cont "read your mind!" diff --git a/text/maps/saffron_house.asm b/text/maps/saffron_house.asm index 9741303a..21ed3b89 100644 --- a/text/maps/saffron_house.asm +++ b/text/maps/saffron_house.asm @@ -1,4 +1,4 @@ -_SaffronHouse1Text1:: ; a2305 (28:6305) +_SaffronHouse1Text1:: text "Thank you for" line "writing. I hope" cont "to see you soon!" @@ -7,16 +7,16 @@ _SaffronHouse1Text1:: ; a2305 (28:6305) line "at my letter!" done -_SaffronHouse1Text2:: ; a2352 (28:6352) +_SaffronHouse1Text2:: text "PIDGEY: Kurukkoo!@@" -_SaffronHouse1Text3:: ; a2366 (28:6366) +_SaffronHouse1Text3:: text "The COPYCAT is" line "cute! I'm getting" cont "her a # DOLL!" done -_SaffronHouse1Text4:: ; a2395 (28:6395) +_SaffronHouse1Text4:: text "I was given a PP" line "UP as a gift." diff --git a/text/maps/saffron_mart.asm b/text/maps/saffron_mart.asm index 703e9b0a..29c34a1c 100644 --- a/text/maps/saffron_mart.asm +++ b/text/maps/saffron_mart.asm @@ -1,4 +1,4 @@ -_SaffronMartText2:: ; a23e3 (28:63e3) +_SaffronMartText2:: text "MAX REPEL lasts" line "longer than SUPER" cont "REPEL for keeping" @@ -6,7 +6,7 @@ _SaffronMartText2:: ; a23e3 (28:63e3) cont "away!" done -_SaffronMartText3:: ; a242a (28:642a) +_SaffronMartText3:: text "REVIVE is costly," line "but it revives" cont "fainted #MON!" diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/saffron_pokecenter.asm index 71aad5e6..9202af9b 100644 --- a/text/maps/saffron_pokecenter.asm +++ b/text/maps/saffron_pokecenter.asm @@ -1,10 +1,10 @@ -_SaffronPokecenterText1:: ; a248e (28:648e) +_SaffronPokecenterText1:: text "#MON growth" line "rates differ from" cont "specie to specie." done -_SaffronPokecenterText3:: ; a24bf (28:64bf) +_SaffronPokecenterText3:: text "SILPH CO. is very" line "famous. That's" cont "why it attracted" diff --git a/text/maps/school.asm b/text/maps/school.asm index 9bdd9004..f6041e0d 100644 --- a/text/maps/school.asm +++ b/text/maps/school.asm @@ -1,18 +1,10 @@ -_SchoolText1:: ; 95d15 (25:5d15) +_SchoolText1:: text "Whew! I'm trying" line "to memorize all" cont "my notes." done -IF DEF(_YELLOW) -_SchoolText3:: - text "Sis says #MON" - line "will become tame" - cont "if you treat them" - cont "nicely." -ENDC - -_SchoolText2:: ; 95d40 (25:5d40) +_SchoolText2:: text "Okay!" para "Be sure to read" diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/seafoam_islands_b4f.asm index 429f426b..c4649f4f 100644 --- a/text/maps/seafoam_islands_b4f.asm +++ b/text/maps/seafoam_islands_b4f.asm @@ -1,13 +1,13 @@ -_SeafoamIslands5BattleText2:: ; 88075 (22:4075) +_SeafoamIslands5BattleText2:: text "Gyaoo!@@" -_SeafoamIslands5Text4:: ; 8807e (22:407e) +_SeafoamIslands5Text4:: text "Boulders might" line "change the flow" cont "of water!" done -_SeafoamIslands5Text5:: ; 880a8 (22:40a8) +_SeafoamIslands5Text5:: text "DANGER" line "Fast current!" done diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm index 75aa6003..e916c64a 100644 --- a/text/maps/silph_co_10f.asm +++ b/text/maps/silph_co_10f.asm @@ -1,68 +1,42 @@ -_SilphCo10Text_5a1d3:: ; 84d8d (21:4d8d) +_SilphCo10Text_5a1d3:: text "Waaaaa!" cont "I'm scared!" done -_SilphCo10Text_5a1d8:: ; 84da1 (21:4da1) +_SilphCo10Text_5a1d8:: text "Please keep quiet" line "about my crying!" done -_SilphCo10BattleText1:: ; 84dc5 (21:4dc5) +_SilphCo10BattleText1:: text "Welcome to the" line "10F! So good of" cont "you to join me!" done -_SilphCo10EndBattleText1:: ; 84df5 (21:4df5) +_SilphCo10EndBattleText1:: text "I'm" line "stunned!" prompt -_SilphCo10AfterBattleText1:: ; 84e02 (21:4e02) +_SilphCo10AfterBattleText1:: text "Nice try, but the" line "boardroom is up" cont "one more floor!" done -_SilphCo10BattleText2:: ; 84e35 (21:4e35) +_SilphCo10BattleText2:: text "Enough of your" line "silly games!" done -_SilphCo10EndBattleText2:: ; 84e52 (21:4e52) +_SilphCo10EndBattleText2:: text "No" line "continues left!" prompt -_SilphCo10AfterBattleText2:: ; 84e66 (21:4e66) +_SilphCo10AfterBattleText2:: text "Are you satisfied" line "with beating me?" cont "Then go on home!" done - -IF DEF(_YELLOW) -_SilphCoJessieJamesText1:: - text "Hold it right" - line "there, brat!@@" - -_SilphCoJessieJamesText2:: - text "Our BOSS is in a" - line "meeting!" - - para "You better not" - line "disturb him!" - done - -_SilphCoJessieJamesText3:: - text "Like" - line "always..." - prompt - -_SilphCoJessieJamesText4:: - text "TEAM ROCKET, blast" - line "off at the speed" - cont "of light!" - - para "Again...@@" -ENDC diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 3dbeee95..2986f3af 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -1,4 +1,4 @@ -_SilphCoPresidentText:: ; 84e9b (21:4e9b) +_SilphCoPresidentText:: text "PRESIDENT: Thank" line "you for saving" cont "SILPH!" @@ -19,13 +19,13 @@ _SilphCoPresidentText:: ; 84e9b (21:4e9b) line "will do!" prompt -_ReceivedSilphCoMasterBallText:: ; 84f63 (21:4f63) +_ReceivedSilphCoMasterBallText:: text $52, " got a" line "@" TX_RAM wcf4b text "!@@" -_SilphCo10Text_6231c:: ; 84f74 (21:4f74) +_SilphCo10Text_6231c:: text "PRESIDENT: You" line "can't buy that" cont "anywhere!" @@ -43,12 +43,12 @@ _SilphCo10Text_6231c:: ; 84f74 (21:4f74) cont "it, though." done -_SilphCoMasterBallNoRoomText:: ; 85013 (21:5013) +_SilphCoMasterBallNoRoomText:: text "You have no" line "room for this." done -_SilphCo11Text2:: ; 8502f (21:502f) +_SilphCo11Text2:: text "SECRETARY: Thank" line "you for rescuing" cont "all of us!" @@ -57,12 +57,8 @@ _SilphCo11Text2:: ; 8502f (21:502f) line "courage." done -_SilphCo11Text3:: ; 85075 (21:5075) -IF DEF(_YELLOW) - text "Ah, ", $52, "!" -ELSE +_SilphCo11Text3:: text "Ah ", $52, "!" -ENDC line "So we meet again!" para "The PRESIDENT and" @@ -74,20 +70,16 @@ ENDC line "out of grown-up" cont "matters..." -IF DEF(_YELLOW) - para "or, experience a" -ELSE para "Or, experience a" -ENDC line "world of pain!" done -_SilphCo10Text_62330:: ; 85119 (21:5119) +_SilphCo10Text_62330:: text "Arrgh!!" line "I lost again!?" prompt -_SilphCo10Text_62335:: ; 85131 (21:5131) +_SilphCo10Text_62335:: text "Blast it all!" line "You ruined our" cont "plans for SILPH!" @@ -104,39 +96,39 @@ _SilphCo10Text_62335:: ; 85131 (21:5131) line "shall return!" done -_SilphCo11BattleText1:: ; 851d6 (21:51d6) +_SilphCo11BattleText1:: text "Stop right there!" line "Don't you move!" done -_SilphCo11EndBattleText1:: ; 851f8 (21:51f8) +_SilphCo11EndBattleText1:: text "Don't..." line "Please!" prompt -_SilphCo11AfterBattleText1:: ; 85209 (21:5209) +_SilphCo11AfterBattleText1:: text "So, you want to" line "see my BOSS?" done -_SilphCo11BattleText2:: ; 85227 (21:5227) +_SilphCo11BattleText2:: text "Halt! Do you have" line "an appointment" cont "with my BOSS?" done -_SilphCo11EndBattleText2:: ; 85257 (21:5257) +_SilphCo11EndBattleText2:: text "Gaah!" line "Demolished!" prompt -_SilphCo11AfterBattleText2:: ; 8526a (21:526a) +_SilphCo11AfterBattleText2:: text "Watch your step," line "my BOSS likes his" cont "#MON tough!" done -_SilphCo10Text_6237b:: ; 8529a (21:529a) +_SilphCo10Text_6237b:: text "The monitor has" line "#MON on it!" done diff --git a/text/maps/silph_co_1f.asm b/text/maps/silph_co_1f.asm index fb25635d..ca166d31 100644 --- a/text/maps/silph_co_1f.asm +++ b/text/maps/silph_co_1f.asm @@ -1,4 +1,4 @@ -_SilphCo1Text1:: ; a245a (28:645a) +_SilphCo1Text1:: text "Welcome!" para "The PRESIDENT is" diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index 4437880c..819a08c1 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -1,4 +1,4 @@ -_SilphCo2Text_59ded:: ; 82454 (20:6454) +_SilphCo2Text_59ded:: text "Eeek!" line "No! Stop! Help!" @@ -9,13 +9,13 @@ _SilphCo2Text_59ded:: ; 82454 (20:6454) cont "please take this!" prompt -_ReceivedTM36Text:: ; 824ba (20:64ba) +_ReceivedTM36Text:: text $52, " got" line "@" TX_RAM wcf4b text "!@@" -_TM36ExplanationText:: ; 824c9 (20:64c9) +_TM36ExplanationText:: text "TM36 is" line "SELFDESTRUCT!" @@ -25,58 +25,54 @@ _TM36ExplanationText:: ; 824c9 (20:64c9) cont "Be careful." done -_TM36NoRoomText:: ; 8251c (20:651c) +_TM36NoRoomText:: text "You don't have any" line "room for this." done -_SilphCo2BattleText1:: ; 8253e (20:653e) +_SilphCo2BattleText1:: text "Help! I'm a SILPH" line "employee." done -_SilphCo2EndBattleText1:: ; 8255a (20:655a) +_SilphCo2EndBattleText1:: text "How" line "did you know I" cont "was a ROCKET?" prompt -_SilphCo2AfterBattleText1:: ; 8257c (20:657c) +_SilphCo2AfterBattleText1:: text "I work for both" line "SILPH and TEAM" cont "ROCKET!" done -_SilphCo2BattleText2:: ; 825a4 (20:65a4) +_SilphCo2BattleText2:: text "It's off limits" line "here! Go home!" done -_SilphCo2EndBattleText2:: ; 825c3 (20:65c3) +_SilphCo2EndBattleText2:: text "You're" line "good." prompt -_SilphCo2AfterBattleText2:: ; 825d0 (20:65d0) +_SilphCo2AfterBattleText2:: text "Can you solve the" line "maze in here?" done -_SilphCo2BattleText3:: ; 825f1 (20:65f1) +_SilphCo2BattleText3:: text "No kids are" line "allowed in here!" done -_SilphCo2EndBattleText3:: ; 8260f (20:660f) +_SilphCo2EndBattleText3:: text "Tough!" prompt -_SilphCo2AfterBattleText3:: ; 82617 (20:6617) -IF DEF(_YELLOW) - text "Diamond-shaped" -ELSE +_SilphCo2AfterBattleText3:: text "Diamond shaped" -ENDC line "tiles are" cont "teleport blocks!" @@ -84,16 +80,16 @@ ENDC line "transporters!" done -_SilphCo2BattleText4:: ; 8265f (20:665f) +_SilphCo2BattleText4:: text "Hey kid! What are" line "you doing here?" done -_SilphCo2EndBattleText4:: ; 82682 (20:6682) +_SilphCo2EndBattleText4:: text "I goofed!" prompt -_SilphCo2AfterBattleText4:: ; 8268d (20:668d) +_SilphCo2AfterBattleText4:: text "SILPH CO. will" line "be merged with" cont "TEAM ROCKET!" diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm index 25d68018..0374482d 100644 --- a/text/maps/silph_co_3f.asm +++ b/text/maps/silph_co_3f.asm @@ -1,42 +1,42 @@ -_SilphCo3Text_59ff9:: ; 826b9 (20:66b9) +_SilphCo3Text_59ff9:: text "I work for SILPH." line "What should I do?" done -_SilphCo3Text_59ffe:: ; 826de (20:66de) +_SilphCo3Text_59ffe:: text $52, "! You and" line "your #MON" cont "saved us!" done -_SilphCo3BattleText1:: ; 826fe (20:66fe) +_SilphCo3BattleText1:: text "Quit messing with" line "us, kid!" done -_SilphCo3EndBattleText1:: ; 8271a (20:671a) +_SilphCo3EndBattleText1:: text "I give" line "up!" prompt -_SilphCo3AfterBattleText1:: ; 82726 (20:6726) +_SilphCo3AfterBattleText1:: text "A hint? You can" line "open doors with a" cont "CARD KEY!" done -_SilphCo3BattleText2:: ; 82753 (20:6753) +_SilphCo3BattleText2:: text "I support TEAM" line "ROCKET more than" cont "I support SILPH!" done -_SilphCo3EndBattleText2:: ; 82785 (20:6785) +_SilphCo3EndBattleText2:: text "You" line "really got me!" prompt -_SilphCo3AfterBattleText2:: ; 82799 (20:6799) +_SilphCo3AfterBattleText2:: text "Humph..." para "TEAM ROCKET said" diff --git a/text/maps/silph_co_4f.asm b/text/maps/silph_co_4f.asm index 309da28c..19494482 100644 --- a/text/maps/silph_co_4f.asm +++ b/text/maps/silph_co_4f.asm @@ -1,56 +1,56 @@ -_SilphCo4Text_19de0:: ; 827e4 (20:67e4) +_SilphCo4Text_19de0:: text "Sssh! Can't you" line "see I'm hiding?" done -_SilphCo4Text_19de5:: ; 82803 (20:6803) +_SilphCo4Text_19de5:: text "Huh? TEAM ROCKET" line "is gone?" done -_SilphCo4BattleText2:: ; 8281e (20:681e) +_SilphCo4BattleText2:: text "TEAM ROCKET has" line "taken command of" cont "SILPH CO.!" done -_SilphCo4EndBattleText2:: ; 8284b (20:684b) +_SilphCo4EndBattleText2:: text "Arrgh!" prompt -_SilphCo4AfterBattleText2:: ; 82853 (20:6853) +_SilphCo4AfterBattleText2:: text "Fwahahaha!" line "My BOSS has been" cont "after this place!" done -_SilphCo4BattleText3:: ; 82882 (20:6882) +_SilphCo4BattleText3:: text "My #MON are my" line "loyal soldiers!" done -_SilphCo4EndBattleText3:: ; 828a2 (20:68a2) +_SilphCo4EndBattleText3:: text "Darn!" line "You weak #MON!" prompt -_SilphCo4AfterBattleText3:: ; 828b8 (20:68b8) +_SilphCo4AfterBattleText3:: text "The doors are" line "electronically" cont "locked! A CARD" cont "KEY opens them!" done -_SilphCo4BattleText4:: ; 828f5 (20:68f5) +_SilphCo4BattleText4:: text "Intruder spotted!" done -_SilphCo4EndBattleText4:: ; 82908 (20:6908) +_SilphCo4EndBattleText4:: text "Who" line "are you?" prompt -_SilphCo4AfterBattleText4:: ; 82916 (20:6916) +_SilphCo4AfterBattleText4:: text "I better tell the" line "BOSS on 11F!" done diff --git a/text/maps/silph_co_5f_1.asm b/text/maps/silph_co_5f_1.asm index 7435c910..dab42539 100644 --- a/text/maps/silph_co_5f_1.asm +++ b/text/maps/silph_co_5f_1.asm @@ -1,56 +1,51 @@ -_SilphCo5Text_1a010:: ; 82936 (20:6936) +_SilphCo5Text_1a010:: text "TEAM ROCKET is" line "in an uproar over" cont "some intruder." cont "That's you right?" done -_SilphCo5Text_1a015:: ; 82978 (20:6978) +_SilphCo5Text_1a015:: text "TEAM ROCKET took" line "off! You're our" cont "hero! Thank you!" done -_SilphCo5BattleText2:: ; 829aa (20:69aa) +_SilphCo5BattleText2:: text "I heard a kid was" line "wandering around." done -_SilphCo5EndBattleText2:: ; 829cf (20:69cf) +_SilphCo5EndBattleText2:: text "Boom!" prompt -_SilphCo5AfterBattleText2:: ; 829d6 (20:69d6) +_SilphCo5AfterBattleText2:: text "It's not smart" line "to pick a fight" cont "with TEAM ROCKET!" done -_SilphCo5BattleText3:: ; 82a07 (20:6a07) +_SilphCo5BattleText3:: text "We study #" line "BALL technology" cont "on this floor!" done -_SilphCo5EndBattleText3:: ; 82a32 (20:6a32) +_SilphCo5EndBattleText3:: text "Dang!" line "Blast it!" prompt -_SilphCo5AfterBattleText3:: ; 82a43 (20:6a43) +_SilphCo5AfterBattleText3:: text "We worked on the" line "ultimate #" cont "BALL which would" cont "catch anything!" done -_SilphCo5BattleText4:: ; 82a81 (20:6a81) +_SilphCo5BattleText4:: text "Whaaat? There" line "shouldn't be any" -IF DEF(_YELLOW) - cont "children here!" -ELSE cont "children here?" -ENDC done - diff --git a/text/maps/silph_co_5f_2.asm b/text/maps/silph_co_5f_2.asm index bb94eb6b..da0c6e6f 100644 --- a/text/maps/silph_co_5f_2.asm +++ b/text/maps/silph_co_5f_2.asm @@ -1,32 +1,32 @@ -_SilphCo5EndBattleText4:: ; 84000 (21:4000) +_SilphCo5EndBattleText4:: text "Oh" line "goodness!" prompt -_SilphCo5AfterBattleText4:: ; 8400e (21:400e) +_SilphCo5AfterBattleText4:: text "You're only on 5F." line "It's a long way" cont "to my BOSS!" done -_SilphCo5BattleText5:: ; 8403c (21:403c) +_SilphCo5BattleText5:: text "Show TEAM ROCKET" line "a little respect!" done -_SilphCo5EndBattleText5:: ; 84060 (21:4060) +_SilphCo5EndBattleText5:: text "Cough..." line "Cough..." prompt -_SilphCo5AfterBattleText5:: ; 84073 (21:4073) +_SilphCo5AfterBattleText5:: text "Which reminds me." para "KOFFING evolves" line "into WEEZING!" done -_SilphCo5Text9:: ; 840a4 (21:40a4) +_SilphCo5Text9:: text "It's a #MON" line "REPORT!" @@ -36,7 +36,7 @@ _SilphCo5Text9:: ; 840a4 (21:40a4) cont "reality #MON." done -_SilphCo5Text10:: ; 840f2 (21:40f2) +_SilphCo5Text10:: text "It's a #MON" line "REPORT!" @@ -45,7 +45,7 @@ _SilphCo5Text10:: ; 840f2 (21:40f2) cont "been confirmed." done -_SilphCo5Text11:: ; 84134 (21:4134) +_SilphCo5Text11:: text "It's a #MON" line "REPORT!" diff --git a/text/maps/silph_co_6f.asm b/text/maps/silph_co_6f.asm index b3bf71b6..b3a38aa0 100644 --- a/text/maps/silph_co_6f.asm +++ b/text/maps/silph_co_6f.asm @@ -1,77 +1,77 @@ -_SilphCo6Text_1a24a:: ; 84176 (21:4176) +_SilphCo6Text_1a24a:: text "The ROCKETs came" line "and took over the" cont "building!" done -_SilphCo6Text_1a24f:: ; 841a4 (21:41a4) +_SilphCo6Text_1a24f:: text "Well, better get" line "back to work!" done -_SilphCo6Text_1a261:: ; 841c4 (21:41c4) +_SilphCo6Text_1a261:: text "Oh dear, oh dear." line "Help me please!" done -_SilphCo6Text_1a266:: ; 841e7 (21:41e7) +_SilphCo6Text_1a266:: text "We got engaged!" line "Heheh!" done -_SilphCo6Text_1a278:: ; 841ff (21:41ff) +_SilphCo6Text_1a278:: text "Look at him! He's" line "such a coward!" done -_SilphCo6Text_1a27d:: ; 84220 (21:4220) +_SilphCo6Text_1a27d:: text "I feel so sorry" line "for him, I have" cont "to marry him!" done -_SilphCo6Text_1a28f:: ; 8424f (21:424f) +_SilphCo6Text_1a28f:: text "TEAM ROCKET is" line "trying to conquer" cont "the world with" cont "#MON!" done -_SilphCo6Text_1a294:: ; 84286 (21:4286) +_SilphCo6Text_1a294:: text "TEAM ROCKET ran" line "because of you!" done -_SilphCo6Text_1a2a6:: ; 842a7 (21:42a7) +_SilphCo6Text_1a2a6:: text "They must have" line "targeted SILPH" cont "for our #MON" cont "products." done -_SilphCo6Text_1a2ab:: ; 842dd (21:42dd) +_SilphCo6Text_1a2ab:: text "Come work for" line "SILPH when you" cont "get older!" done -_SilphCo6BattleText2:: ; 84306 (21:4306) +_SilphCo6BattleText2:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo6EndBattleText2:: ; 8432a (21:432a) +_SilphCo6EndBattleText2:: text "Flame" line "out!" prompt -_SilphCo6AfterBattleText2:: ; 84336 (21:4336) +_SilphCo6AfterBattleText2:: text "No matter!" line "My brothers will" cont "avenge me!" done -_SilphCo6BattleText3:: ; 8435e (21:435e) +_SilphCo6BattleText3:: text "That rotten" line "PRESIDENT!" @@ -80,27 +80,27 @@ _SilphCo6BattleText3:: ; 8435e (21:435e) cont "TIKSI BRANCH!" done -_SilphCo6EndBattleText3:: ; 843a4 (21:43a4) +_SilphCo6EndBattleText3:: text "Shoot!" prompt -_SilphCo6AfterBattleText3:: ; 843ac (21:43ac) +_SilphCo6AfterBattleText3:: text "TIKSI BRANCH?" line "It's in Russian" cont "no man's land!" done -_SilphCo6BattleText4:: ; 843d8 (21:43d8) +_SilphCo6BattleText4:: text "You dare betray" line "TEAM ROCKET?" done -_SilphCo6EndBattleText4:: ; 843f6 (21:43f6) +_SilphCo6EndBattleText4:: text "You" line "traitor!" prompt -_SilphCo6AfterBattleText4:: ; 84404 (21:4404) +_SilphCo6AfterBattleText4:: text "If you stand for" line "justice, you" cont "betray evil!" diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm index 5b56ad43..f29c16bc 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/silph_co_7f.asm @@ -78,82 +78,78 @@ _SilphCo7Text_51e4b:: line "Oh thank you!" done -_SilphCo7BattleText1:: ; 846ff (21:46ff) -IF DEF(_YELLOW) - text "Aha! I smell a" -ELSE +_SilphCo7BattleText1:: text "Oh ho! I smell a" -ENDC line "little rat!" done -_SilphCo7EndBattleText1:: ; 8471d (21:471d) +_SilphCo7EndBattleText1:: text "Lights" line "out!" prompt -_SilphCo7AfterBattleText1:: ; 8472a (21:472a) +_SilphCo7AfterBattleText1:: text "You won't find my" line "BOSS by just" cont "scurrying around!" done -_SilphCo7BattleText2:: ; 8475b (21:475b) +_SilphCo7BattleText2:: text "Heheh!" para "You mistook me for" line "a SILPH worker?" done -_SilphCo7EndBattleText2:: ; 84786 (21:4786) +_SilphCo7EndBattleText2:: text "I'm" line "done!" prompt -_SilphCo7AfterBattleText2:: ; 84790 (21:4790) +_SilphCo7AfterBattleText2:: text "Despite your age," line "you are a skilled" cont "trainer!" done -_SilphCo7BattleText3:: ; 847be (21:47be) +_SilphCo7BattleText3:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo7EndBattleText3:: ; 847e2 (21:47e2) +_SilphCo7EndBattleText3:: text "Aack!" line "Brothers, I lost!" prompt -_SilphCo7AfterBattleText3:: ; 847fb (21:47fb) +_SilphCo7AfterBattleText3:: text "Doesn't matter." line "My brothers will" cont "repay the favor!" done -_SilphCo7BattleText4:: ; 8482d (21:482d) +_SilphCo7BattleText4:: text "A child intruder?" line "That must be you!" done -_SilphCo7EndBattleText4:: ; 84852 (21:4852) +_SilphCo7EndBattleText4:: text "Fine!" line "I lost!" prompt -_SilphCo7AfterBattleText4:: ; 84861 (21:4861) +_SilphCo7AfterBattleText4:: text "Go on home" line "before my BOSS" cont "gets ticked off!" done -_SilphCo7Text_51ebe:: ; 8488d (21:488d) +_SilphCo7Text_51ebe:: text $53, ": What" line "kept you ", $52, "?" done -_SilphCo7Text_51ec3:: ; 848a2 (21:48a2) +_SilphCo7Text_51ec3:: text $53, ": Hahaha!" line "I thought you'd" cont "turn up if I" @@ -170,17 +166,13 @@ _SilphCo7Text_51ec3:: ; 848a2 (21:48a2) cont "you got better!" done -_SilphCo7Text_51ec8:: ; 8494a (21:494a) -IF DEF(_YELLOW) - text "Oh-oh!" -ELSE +_SilphCo7Text_51ec8:: text "Oh ho!" -ENDC line "So, you are ready" cont "for BOSS ROCKET!" prompt -_SilphCo7Text_51ecd:: ; 84975 (21:4975) +_SilphCo7Text_51ecd:: text $53, ": How can" line "I put this?" @@ -189,7 +181,7 @@ _SilphCo7Text_51ecd:: ; 84975 (21:4975) cont "with us big boys!" prompt -_SilphCo7Text_51ed2:: ; 849bd (21:49bd) +_SilphCo7Text_51ed2:: text "Well, ", $52, "!" para "I'm moving on up" diff --git a/text/maps/silph_co_8f.asm b/text/maps/silph_co_8f.asm index 900e134f..898c0600 100644 --- a/text/maps/silph_co_8f.asm +++ b/text/maps/silph_co_8f.asm @@ -1,56 +1,56 @@ -_SilphCo8Text_565be:: ; 84ac4 (21:4ac4) +_SilphCo8Text_565be:: text "I wonder if SILPH" line "is finished..." done -_SilphCo8Text_565c3:: ; 84ae6 (21:4ae6) +_SilphCo8Text_565c3:: text "Thanks for saving" line "us!" done -_SilphCo8BattleText1:: ; 84afd (21:4afd) +_SilphCo8BattleText1:: text "That's as far as" line "you'll go!" done -_SilphCo8EndBattleText1:: ; 84b18 (21:4b18) +_SilphCo8EndBattleText1:: text "Not" line "enough grit!" prompt -_SilphCo8AfterBattleText1:: ; 84b2a (21:4b2a) +_SilphCo8AfterBattleText1:: text "If you don't turn" line "back, I'll call" cont "for backup!" done -_SilphCo8BattleText2:: ; 84b57 (21:4b57) +_SilphCo8BattleText2:: text "You're causing us" line "problems!" done -_SilphCo8EndBattleText2:: ; 84b73 (21:4b73) +_SilphCo8EndBattleText2:: text "Huh?" line "I lost?" prompt -_SilphCo8AfterBattleText2:: ; 84b81 (21:4b81) +_SilphCo8AfterBattleText2:: text "So, what do you" line "think of SILPH" cont "BUILDING's maze?" done -_SilphCo8BattleText3:: ; 84bb1 (21:4bb1) +_SilphCo8BattleText3:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo8EndBattleText3:: ; 84bd5 (21:4bd5) +_SilphCo8EndBattleText3:: text "Whoo!" line "Oh brothers!" prompt -_SilphCo8AfterBattleText3:: ; 84be9 (21:4be9) +_SilphCo8AfterBattleText3:: text "I'll leave you up" line "to my brothers!" done diff --git a/text/maps/silph_co_9f.asm b/text/maps/silph_co_9f.asm index 6854b081..f01ffb7b 100644 --- a/text/maps/silph_co_9f.asm +++ b/text/maps/silph_co_9f.asm @@ -1,62 +1,62 @@ -_SilphCo9Text_5d8e5:: ; 84c0b (21:4c0b) +_SilphCo9Text_5d8e5:: text "You look tired!" line "You should take a" cont "quick nap!" prompt -_SilphCo9Text_5d8ea:: ; 84c39 (21:4c39) +_SilphCo9Text_5d8ea:: text "Don't give up!" done -_SilphCo9Text_5d8ef:: ; 84c48 (21:4c48) +_SilphCo9Text_5d8ef:: text "Thank you so" line "much!" done -_SilphCo9BattleText1:: ; 84c5c (21:4c5c) +_SilphCo9BattleText1:: text "Your #MON seem" line "to adore you, kid!" done -_SilphCo9EndBattleText1:: ; 84c7f (21:4c7f) +_SilphCo9EndBattleText1:: text "Ghaaah!" prompt -_SilphCo9AfterBattleText1:: ; 84c88 (21:4c88) +_SilphCo9AfterBattleText1:: text "If I had started" line "as a trainer at" cont "your age..." done -_SilphCo9BattleText2:: ; 84cb6 (21:4cb6) +_SilphCo9BattleText2:: text "Your #MON have" line "weak points! I" cont "can nail them!" done -_SilphCo9EndBattleText2:: ; 84ce4 (21:4ce4) +_SilphCo9EndBattleText2:: text "You" line "hammered me!" prompt -_SilphCo9AfterBattleText2:: ; 84cf6 (21:4cf6) +_SilphCo9AfterBattleText2:: text "Exploiting weak" line "spots does work!" cont "Think about" cont "element types!" done -_SilphCo9BattleText3:: ; 84d33 (21:4d33) +_SilphCo9BattleText3:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo9EndBattleText3:: ; 84d57 (21:4d57) +_SilphCo9EndBattleText3:: text "Warg!" line "Brothers, I lost!" prompt -_SilphCo9AfterBattleText3:: ; 84d70 (21:4d70) +_SilphCo9AfterBattleText3:: text "My brothers will" line "avenge me!" done diff --git a/text/maps/ss_anne_1.asm b/text/maps/ss_anne_1.asm index 2236ca52..6032b770 100644 --- a/text/maps/ss_anne_1.asm +++ b/text/maps/ss_anne_1.asm @@ -1,4 +1,4 @@ -_SSAnne1Text1:: ; 80c70 (20:4c70) +_SSAnne1Text1:: text "Bonjour!" line "I am le waiter on" cont "this ship!" @@ -11,7 +11,7 @@ _SSAnne1Text1:: ; 80c70 (20:4c70) line "silent type!" done -_SSAnne1Text2:: ; 80ce6 (20:4ce6) +_SSAnne1Text2:: text "The passengers" line "are restless!" diff --git a/text/maps/ss_anne_10.asm b/text/maps/ss_anne_10.asm index cf1d0ce5..f1eb8a77 100644 --- a/text/maps/ss_anne_10.asm +++ b/text/maps/ss_anne_10.asm @@ -1,88 +1,88 @@ -_SSAnne10Text8:: ; 81aaa (20:5aaa) +_SSAnne10Text8:: text "MACHOKE: Gwoh!" line "Goggoh!@@" -_SSAnne10BattleText1:: ; 81ac3 (20:5ac3) +_SSAnne10BattleText1:: text "You know what they" line "say about sailors" cont "and fighting!" done -_SSAnne10EndBattleText1:: ; 81af7 (20:5af7) +_SSAnne10EndBattleText1:: text "Right!" line "Good fight, mate!" prompt -_SSAnne10AfterBattleText1:: ; 81b11 (20:5b11) +_SSAnne10AfterBattleText1:: text "Haha! Want to be" line "a sailor, mate?" done -_SSAnne10BattleText2:: ; 81b33 (20:5b33) +_SSAnne10BattleText2:: text "My sailor's pride" line "is at stake!" done -_SSAnne10EndBattleText2:: ; 81b52 (20:5b52) +_SSAnne10EndBattleText2:: text "Your" line "spirit sank me!" prompt -_SSAnne10AfterBattleText2:: ; 81b68 (20:5b68) +_SSAnne10AfterBattleText2:: text "Did you see the" line "FISHING GURU in" cont "VERMILION CITY?" done -_SSAnne10BattleText3:: ; 81b99 (20:5b99) +_SSAnne10BattleText3:: text "Us sailors have" line "#MON too!" done -_SSAnne10EndBattleText3:: ; 81bb4 (20:5bb4) +_SSAnne10EndBattleText3:: text "OK, " line "you're not bad." prompt -_SSAnne10AfterBattleText3:: ; 81bc9 (20:5bc9) +_SSAnne10AfterBattleText3:: text "We caught all our" line "#MON while" cont "out at sea!" done -_SSAnne10BattleText4:: ; 81bf3 (20:5bf3) +_SSAnne10BattleText4:: text "I like feisty" line "kids like you!@@" -_SSAnne10EndBattleText4:: ; 81c12 (20:5c12) +_SSAnne10EndBattleText4:: text "Argh!" line "Lost it!" prompt -_SSAnne10AfterBattleText4:: ; 81c22 (20:5c22) +_SSAnne10AfterBattleText4:: text "Sea #MON live" line "in deep water." cont "You'll need a ROD!" done -_SSAnne10BattleText5:: ; 81c52 (20:5c52) +_SSAnne10BattleText5:: text "Matey, you're" line "walking the plank" cont "if you lose!" done -_SSAnne10EndBattleText5:: ; 81c7f (20:5c7f) +_SSAnne10EndBattleText5:: text "Argh!" line "Beaten by a kid!" prompt -_SSAnne10AfterBattleText5:: ; 81c97 (20:5c97) +_SSAnne10AfterBattleText5:: text "Jellyfish some-" line "times drift into" cont "the ship." done -_SSAnne10BattleText6:: ; 81cc3 (20:5cc3) +_SSAnne10BattleText6:: text "Hello stranger!" line "Stop and chat!" @@ -90,19 +90,19 @@ _SSAnne10BattleText6:: ; 81cc3 (20:5cc3) line "are from the sea!" done -_SSAnne10EndBattleText6:: ; 81d01 (20:5d01) +_SSAnne10EndBattleText6:: text "Darn!" line "I let that one" cont "get away!" prompt -_SSAnne10AfterBattleText6:: ; 81d21 (20:5d21) +_SSAnne10AfterBattleText6:: text "I was going to" line "make you my" cont "assistant too!" done -_SSAnne10Text7:: ; 81d4c (20:5d4c) +_SSAnne10Text7:: text "My buddy, MACHOKE," line "is super strong!" diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm index 0a29f8e6..bd33b9d3 100644 --- a/text/maps/ss_anne_2.asm +++ b/text/maps/ss_anne_2.asm @@ -1,4 +1,4 @@ -_SSAnne2Text1:: ; 80d34 (20:4d34) +_SSAnne2Text1:: text "This ship, she is" line "a luxury liner" cont "for trainers!" @@ -8,7 +8,7 @@ _SSAnne2Text1:: ; 80d34 (20:4d34) cont "invited trainers!" done -_SSAnneRivalBeforeBattleText:: ; 80d9a (20:4d9a) +_SSAnneRivalBeforeBattleText:: text $53, ": Bonjour!" line $52, "!" @@ -31,7 +31,7 @@ _SSAnneRivalBeforeBattleText:: ; 80d9a (20:4d9a) line "grassy areas!" done -_SSAnneRivalDefeatedText:: ; 80e57 (20:4e57) +_SSAnneRivalDefeatedText:: text "Humph!" para "At least you're" @@ -39,7 +39,7 @@ _SSAnneRivalDefeatedText:: ; 80e57 (20:4e57) cont "#MON!" prompt -_SSAnneRivalWonText:: ; 80e81 (20:4e81) +_SSAnneRivalWonText:: text $52, "! What are" line "you, seasick?" @@ -47,7 +47,7 @@ _SSAnneRivalWonText:: ; 80e81 (20:4e81) line "up, pal!" prompt -_SSAnneRivalCaptainText:: ; 80eb6 (20:4eb6) +_SSAnneRivalCaptainText:: text $53, ": I heard" line "there was a CUT" cont "master on board." diff --git a/text/maps/ss_anne_3.asm b/text/maps/ss_anne_3.asm index de2c070d..8ac96d88 100644 --- a/text/maps/ss_anne_3.asm +++ b/text/maps/ss_anne_3.asm @@ -1,4 +1,4 @@ -_SSAnne3Text1:: ; 80f4b (20:4f4b) +_SSAnne3Text1:: text "Our CAPTAIN is a" line "sword master!" diff --git a/text/maps/ss_anne_5.asm b/text/maps/ss_anne_5.asm index 2fdc5dd8..b4935f5b 100644 --- a/text/maps/ss_anne_5.asm +++ b/text/maps/ss_anne_5.asm @@ -1,50 +1,50 @@ -_SSAnne5Text1:: ; 80f88 (20:4f88) +_SSAnne5Text1:: text "The party's over." line "The ship will be" cont "departing soon." done -_SSAnne5Text2:: ; 80fbb (20:4fbb) +_SSAnne5Text2:: text "Scrubbing decks" line "is hard work!" done -_SSAnne5Text3:: ; 80fda (20:4fda) +_SSAnne5Text3:: text "Urf. I feel ill." para "I stepped out to" line "get some air." done -_SSAnne5BattleText1:: ; 8100b (20:500b) +_SSAnne5BattleText1:: text "Hey matey!" para "Let's do a little" line "jig!" done -_SSAnne5EndBattleText1:: ; 8102d (20:502d) +_SSAnne5EndBattleText1:: text "You're" line "impressive!" prompt -_SSAnne5AfterBattleText1:: ; 81040 (20:5040) +_SSAnne5AfterBattleText1:: text "How many kinds of" line "#MON do you" cont "think there are?" done -_SSAnne5BattleText2:: ; 81070 (20:5070) +_SSAnne5BattleText2:: text "Ahoy there!" line "Are you seasick?" done -_SSAnne5EndBattleText2:: ; 8108e (20:508e) +_SSAnne5EndBattleText2:: text "I was" line "just careless!" prompt -_SSAnne5AfterBattleText2:: ; 810a4 (20:50a4) +_SSAnne5AfterBattleText2:: text "My Pa said there" line "are 100 kinds of" cont "#MON. I think" diff --git a/text/maps/ss_anne_6.asm b/text/maps/ss_anne_6.asm index 59828a51..51c941a8 100644 --- a/text/maps/ss_anne_6.asm +++ b/text/maps/ss_anne_6.asm @@ -1,20 +1,20 @@ -_SSAnne6Text1:: ; 810e5 (20:50e5) +_SSAnne6Text1:: text "You, mon petit!" line "We're busy here!" cont "Out of the way!" done -_SSAnne6Text2:: ; 81116 (20:5116) +_SSAnne6Text2:: text "I saw an odd ball" line "in the trash." done -_SSAnne6Text3:: ; 81137 (20:5137) +_SSAnne6Text3:: text "I'm so busy I'm" line "getting dizzy!" done -_SSAnne6Text4:: ; 81155 (20:5155) +_SSAnne6Text4:: text "Hum-de-hum-de-" line "ho..." @@ -23,7 +23,7 @@ _SSAnne6Text4:: ; 81155 (20:5155) cont "Hum-hum..." done -_SSAnne6Text5:: ; 8118e (20:518e) +_SSAnne6Text5:: text "Did you hear about" line "SNORLAX?" @@ -31,7 +31,7 @@ _SSAnne6Text5:: ; 8118e (20:518e) line "eat and sleep!" done -_SSAnne6Text6:: ; 811c9 (20:51c9) +_SSAnne6Text6:: text "Snivel...Sniff..." para "I only get to" @@ -39,33 +39,29 @@ _SSAnne6Text6:: ; 811c9 (20:51c9) cont "Snivel..." done -_SSAnne6Text_61807:: ; 81203 (20:5203) +_SSAnne6Text_61807:: text "Er-hem! Indeed I" line "am le CHEF!" para "Le main course is" prompt -_SSAnne6Text_6180c:: ; 81233 (20:5233) -IF DEF(_YELLOW) - text "Salade de Salmon!" -ELSE +_SSAnne6Text_6180c:: text "Salmon du Salad!" -ENDC para "Les guests may" line "gripe it's fish" cont "again, however!" done -_SSAnne6Text_61811:: ; 81273 (20:5273) +_SSAnne6Text_61811:: text "Eels au Barbecue!" para "Les guests will" line "mutiny, I fear." done -_SSAnne6Text_61816:: ; 812a6 (20:52a6) +_SSAnne6Text_61816:: text "Prime Beef Steak!" para "But, have I enough" diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm index 2a770464..4687c421 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -1,4 +1,4 @@ -_SSAnne7RubText:: ; 812dd (20:52dd) +_SSAnne7RubText:: text "CAPTAIN: Ooargh..." line "I feel hideous..." cont "Urrp! Seasick..." @@ -10,7 +10,7 @@ _SSAnne7RubText:: ; 812dd (20:52dd) para "Rub-rub..." line "Rub-rub...@@" -_ReceivingHM01Text:: ; 81347 (20:5347) +_ReceivingHM01Text:: text "CAPTAIN: Whew!" line "Thank you! I" cont "feel much better!" @@ -27,42 +27,34 @@ _ReceivingHM01Text:: ; 81347 (20:5347) para "Teach it to your" line "#MON and you" cont "can see it CUT" -IF DEF(_YELLOW) - cont "anytime!" -ELSE cont "any time!" -ENDC prompt -_ReceivedHM01Text:: ; 8140d (20:540d) +_ReceivedHM01Text:: text $52, " got" line "@" TX_RAM wcf4b text "!@@" -_SSAnne7Text_61932:: ; 8141c (20:541c) +_SSAnne7Text_61932:: text "CAPTAIN: Whew!" para "Now that I'm not" -IF DEF(_YELLOW) - line "sick anymore, I" -ELSE line "sick any more, I" -ENDC cont "guess it's time." done -_HM01NoRoomText:: ; 8145d (20:545d) +_HM01NoRoomText:: text "Oh no! You have" line "no room for this!" done -_SSAnne7Text2:: ; 81480 (20:5480) +_SSAnne7Text2:: text "Yuck! Shouldn't" line "have looked!" done -_SSAnne7Text3:: ; 8149d (20:549d) +_SSAnne7Text3:: text "How to Conquer" line "Seasickness..." cont "The CAPTAIN's" diff --git a/text/maps/ss_anne_8.asm b/text/maps/ss_anne_8.asm index c44ad605..393633e3 100644 --- a/text/maps/ss_anne_8.asm +++ b/text/maps/ss_anne_8.asm @@ -1,8 +1,8 @@ -_SSAnne8Text8:: ; 814d7 (20:54d7) +_SSAnne8Text8:: text "WIGGLYTUFF: Puup" line "pupuu!@@" -_SSAnne8BattleText1:: ; 814f1 (20:54f1) +_SSAnne8BattleText1:: text "I travel alone" line "on my journeys!" @@ -10,42 +10,42 @@ _SSAnne8BattleText1:: ; 814f1 (20:54f1) line "only friends!" done -_SSAnne8EndBattleText1:: ; 8152e (20:552e) +_SSAnne8EndBattleText1:: text "My, my" line "friends..." prompt -_SSAnne8AfterBattleText1:: ; 81541 (20:5541) +_SSAnne8AfterBattleText1:: text "You should be" line "nice to friends!" done -_SSAnne8BattleText2:: ; 81561 (20:5561) +_SSAnne8BattleText2:: text "You pup! How dare" line "you barge in!" done -_SSAnne8EndBattleText2:: ; 81582 (20:5582) +_SSAnne8EndBattleText2:: text "Humph!" line "You rude child!" prompt -_SSAnne8AfterBattleText2:: ; 8159a (20:559a) +_SSAnne8AfterBattleText2:: text "I wish to be left" line "alone! Get out!" done -_SSAnne8BattleText3:: ; 815bd (20:55bd) +_SSAnne8BattleText3:: text "I love #MON!" line "Do you?" done -_SSAnne8EndBattleText3:: ; 815d3 (20:55d3) +_SSAnne8EndBattleText3:: text "Wow! " line "You're great!" prompt -_SSAnne8AfterBattleText3:: ; 815e7 (20:55e7) +_SSAnne8AfterBattleText3:: text "Let me be your" line "friend, OK?" @@ -53,19 +53,19 @@ _SSAnne8AfterBattleText3:: ; 815e7 (20:55e7) line "#MON!" done -_SSAnne8BattleText4:: ; 8161b (20:561b) +_SSAnne8BattleText4:: text "I collected these" line "#MON from all" cont "around the world!" done -_SSAnne8EndBattleText4:: ; 8164e (20:564e) +_SSAnne8EndBattleText4:: text "Oh no!" line "I went around the" cont "world for these!" prompt -_SSAnne8AfterBattleText4:: ; 81679 (20:5679) +_SSAnne8AfterBattleText4:: text "You hurt my poor" line "worldly #MON!" @@ -74,28 +74,28 @@ _SSAnne8AfterBattleText4:: ; 81679 (20:5679) cont "#MON CENTER!" done -_SSAnne8Text5:: ; 816c7 (20:56c7) +_SSAnne8Text5:: text "Waiter, I would" line "like a cherry pie" cont "please!" done -_SSAnne8Text6:: ; 816f2 (20:56f2) +_SSAnne8Text6:: text "A cruise is so" line "elegant yet cozy!" done -_SSAnne8Text7:: ; 81714 (20:5714) +_SSAnne8Text7:: text "I always travel" line "with WIGGLYTUFF!" done -_SSAnne8Text9:: ; 81736 (20:5736) +_SSAnne8Text9:: text "We are cruising" line "around the world." done -_SSAnne8Text11:: ; 81759 (20:5759) +_SSAnne8Text11:: text "Ssh! I'm a GLOBAL" line "POLICE agent!" diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm index c96a7581..efdc014a 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/ss_anne_9.asm @@ -1,9 +1,5 @@ -_SSAnne9Text_61bf2:: ; 81799 (20:5799) -IF DEF(_YELLOW) - text "In all my travels," -ELSE +_SSAnne9Text_61bf2:: text "In all my travels" -ENDC line "I've never seen" cont "any #MON sleep" cont "like this one!" @@ -12,19 +8,19 @@ ENDC line "like this!" prompt -_SSAnne9Text_61c01:: ; 817f5 (20:57f5) +_SSAnne9Text_61c01:: text "Ah yes, I have" line "seen some #MON" cont "ferry people" cont "across the water!" done -_SSAnne9Text_61c10:: ; 81833 (20:5833) +_SSAnne9Text_61c10:: text "#MON can CUT" line "down small bushes." done -_SSAnne9Text_61c1f:: ; 81854 (20:5854) +_SSAnne9Text_61c1f:: text "Have you gone to" line "the SAFARI ZONE" cont "in FUCHSIA CITY?" @@ -33,51 +29,51 @@ _SSAnne9Text_61c1f:: ; 81854 (20:5854) line "kinds of #MON!!" done -_SSAnne9Text_61c2e:: ; 818a8 (20:58a8) +_SSAnne9Text_61c2e:: text "Me and my Daddy" line "think the SAFARI" cont "ZONE is awesome!" done -_SSAnne9Text_61c3d:: ; 818db (20:58db) +_SSAnne9Text_61c3d:: text "The CAPTAIN looked" line "really sick and" cont "pale!" done -_SSAnne9Text_61c4c:: ; 81905 (20:5905) +_SSAnne9Text_61c4c:: text "I hear many people" line "get seasick!" done -_SSAnne9BattleText1:: ; 81926 (20:5926) +_SSAnne9BattleText1:: text "Competing against" line "the young keeps" cont "me youthful." done -_SSAnne9EndBattleText1:: ; 81956 (20:5956) +_SSAnne9EndBattleText1:: text "Good" line "fight! Ah, I feel" cont "young again!" prompt -_SSAnne9AfterBattleText1:: ; 8197b (20:597b) +_SSAnne9AfterBattleText1:: text "15 years ago, I" line "would have won!" done -_SSAnne9BattleText2:: ; 8199c (20:599c) +_SSAnne9BattleText2:: text "Check out what I" line "fished up!" done -_SSAnne9EndBattleText2:: ; 819b9 (20:59b9) +_SSAnne9EndBattleText2:: text "I'm" line "all out!" prompt -_SSAnne9AfterBattleText2:: ; 819c6 (20:59c6) +_SSAnne9AfterBattleText2:: text "Party?" para "The cruise ship's" @@ -85,33 +81,33 @@ _SSAnne9AfterBattleText2:: ; 819c6 (20:59c6) cont "over by now." done -_SSAnne9BattleText3:: ; 819fc (20:59fc) +_SSAnne9BattleText3:: text "Which do you like," line "a strong or a" cont "rare #MON?" done -_SSAnne9EndBattleText3:: ; 81a29 (20:5a29) +_SSAnne9EndBattleText3:: text "I must" line "salute you!" prompt -_SSAnne9AfterBattleText3:: ; 81a3d (20:5a3d) +_SSAnne9AfterBattleText3:: text "I prefer strong" line "and rare #MON." done -_SSAnne9BattleText4:: ; 81a5d (20:5a5d) +_SSAnne9BattleText4:: text "I never saw you" line "at the party." done -_SSAnne9EndBattleText4:: ; 81a7c (20:5a7c) +_SSAnne9EndBattleText4:: text "Take" line "it easy!" prompt -_SSAnne9AfterBattleText4:: ; 81a8b (20:5a8b) +_SSAnne9AfterBattleText4:: text "Oh, I adore your" line "strong #MON!" done diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/underground_path_route_6_entrance.asm index 67a33b6d..c898d199 100644 --- a/text/maps/underground_path_route_6_entrance.asm +++ b/text/maps/underground_path_route_6_entrance.asm @@ -1,4 +1,4 @@ -_UndergrdTunnelEntRoute6Text1:: ; 8c0cb (23:40cb) +_UndergrdTunnelEntRoute6Text1:: text "People often lose" line "things in that" cont "UNDERGROUND PATH." diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/underground_path_route_7_entrance.asm index bb35935d..dee62853 100644 --- a/text/maps/underground_path_route_7_entrance.asm +++ b/text/maps/underground_path_route_7_entrance.asm @@ -1,4 +1,4 @@ -_UndergroundPathEntRoute7Text1:: ; 8c0ff (23:40ff) +_UndergroundPathEntRoute7Text1:: text "I heard a sleepy" line "#MON appeared" cont "near CELADON CITY." diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm index 0c24f9f7..057c7b0c 100644 --- a/text/maps/underground_path_route_7_entrance_unused.asm +++ b/text/maps/underground_path_route_7_entrance_unused.asm @@ -1,4 +1,4 @@ -_UGPathRoute7EntranceUnusedText_5d773:: ; 8c132 (23:4132) +_UGPathRoute7EntranceUnusedText_5d773:: text "I want to shop at" line "the dept. store" cont "in CELADON but..." @@ -8,13 +8,13 @@ _UGPathRoute7EntranceUnusedText_5d773:: ; 8c132 (23:4132) cont "people there." done -_UGPathRoute7EntranceUnusedText_5d778:: ; 8c195 (23:4195) +_UGPathRoute7EntranceUnusedText_5d778:: text "TEAM ROCKET had a" line "secret hideout in" cont "CELADON CITY?" done -_UGPathRoute7EntranceUnusedText_5d77d:: ; 8c1c8 (23:41c8) +_UGPathRoute7EntranceUnusedText_5d77d:: text "You're here to" line "shop in CELADON?" @@ -22,7 +22,7 @@ _UGPathRoute7EntranceUnusedText_5d77d:: ; 8c1c8 (23:41c8) line "and head west!" done -_UGPathRoute7EntranceUnusedText_5d782:: ; 8c209 (23:4209) +_UGPathRoute7EntranceUnusedText_5d782:: text "The UNDERGROUND" line "PATH goes beneath" cont "SAFFRON and leads" diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/underground_path_route_8_entrance.asm index 8c546cb0..0df1dec9 100644 --- a/text/maps/underground_path_route_8_entrance.asm +++ b/text/maps/underground_path_route_8_entrance.asm @@ -1,4 +1,4 @@ -_UndergroundPathEntRoute8Text1:: ; 8c28d (23:428d) +_UndergroundPathEntRoute8Text1:: text "The dept. store" line "in CELADON has a" cont "great selection!" diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/unknown_dungeon_b1f.asm index 9af3a6bf..bea7df28 100644 --- a/text/maps/unknown_dungeon_b1f.asm +++ b/text/maps/unknown_dungeon_b1f.asm @@ -1,3 +1,3 @@ -_UnknownDungeon3MewtwoText:: ; 85c72 (21:5c72) +_UnknownDungeon3MewtwoText:: text "Mew!@@" diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index 9c27bf64..07ed1b96 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -1,4 +1,4 @@ -_VermilionCityText1:: ; a5668 (29:5668) +_VermilionCityText1:: text "We're careful" line "about pollution!" @@ -7,13 +7,13 @@ _VermilionCityText1:: ; a5668 (29:5668) cont "toxic sludge!" done -_VermilionCityText_198a7:: ; a56b5 (29:56b5) +_VermilionCityText_198a7:: text "Did you see S.S." line "ANNE moored in" cont "the harbor?" done -_VermilionCityText_198ac:: ; a56e2 (29:56e2) +_VermilionCityText_198ac:: text "So, S.S.ANNE has" line "departed!" @@ -21,12 +21,12 @@ _VermilionCityText_198ac:: ; a56e2 (29:56e2) line "about a year." done -_SSAnneWelcomeText4:: ; a571d (29:571d) +_SSAnneWelcomeText4:: text "Welcome to S.S." line "ANNE!" done -_SSAnneWelcomeText9:: ; a5734 (29:5734) +_SSAnneWelcomeText9:: text "Welcome to S.S." line "ANNE!" @@ -34,7 +34,7 @@ _SSAnneWelcomeText9:: ; a5734 (29:5734) line "have a ticket?" prompt -_SSAnneFlashedTicketText:: ; a576c (29:576c) +_SSAnneFlashedTicketText:: text $52, " flashed" line "the S.S.TICKET!" @@ -42,7 +42,7 @@ _SSAnneFlashedTicketText:: ; a576c (29:576c) line "S.S.ANNE!" done -_SSAnneNoTicketText:: ; a57a3 (29:57a3) +_SSAnneNoTicketText:: text $52, " doesn't" line "have the needed" cont "S.S.TICKET." @@ -53,11 +53,11 @@ _SSAnneNoTicketText:: ; a57a3 (29:57a3) line "to get aboard." done -_SSAnneNotHereText:: ; a57f1 (29:57f1) +_SSAnneNotHereText:: text "The ship set sail." done -_VermilionCityText4:: ; a5805 (29:5805) +_VermilionCityText4:: text "I'm putting up a" line "building on this" cont "plot of land." @@ -66,18 +66,18 @@ _VermilionCityText4:: ; a5805 (29:5805) line "tamping the land." done -_VermilionCityText5:: ; a5852 (29:5852) +_VermilionCityText5:: text "MACHOP: Guoh!" line "Gogogoh!@@" -_VermilionCityText14:: ; a586b (29:586b) +_VermilionCityText14:: db $0 para "A MACHOP is" line "stomping the land" cont "flat." done -_VermilionCityText6:: ; a5891 (29:5891) +_VermilionCityText6:: text "S.S.ANNE is a" line "famous luxury" cont "cruise ship." @@ -86,13 +86,13 @@ _VermilionCityText6:: ; a5891 (29:5891) line "once a year." done -_VermilionCityText7:: ; a58db (29:58db) +_VermilionCityText7:: text "VERMILION CITY" line "The Port of" cont "Exquisite Sunsets" done -_VermilionCityText8:: ; a5909 (29:5909) +_VermilionCityText8:: text "NOTICE!" para "ROUTE 12 may be" @@ -106,13 +106,13 @@ _VermilionCityText8:: ; a5909 (29:5909) para "VERMILION POLICE" done -_VermilionCityText11:: ; a5980 (29:5980) +_VermilionCityText11:: text "#MON FAN CLUB" line "All #MON fans" cont "welcome!" done -_VermilionCityText12:: ; a59a6 (29:59a6) +_VermilionCityText12:: text "VERMILION CITY" line "#MON GYM" cont "LEADER: LT.SURGE" @@ -121,7 +121,7 @@ _VermilionCityText12:: ; a59a6 (29:59a6) line "American!" done -_VermilionCityText13:: ; a59e9 (29:59e9) +_VermilionCityText13:: text "VERMILION HARBOR" done diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm index 17436742..26c556a7 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/vermilion_dock.asm @@ -1,3 +1,3 @@ -_VermilionDockText1:: ; 9c50e (27:450e) +_VermilionDockText1:: db $0, $57 diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm index b1377252..59f730db 100644 --- a/text/maps/vermilion_fishing_house.asm +++ b/text/maps/vermilion_fishing_house.asm @@ -1,4 +1,4 @@ -_VermilionHouse2Text_560b1:: ; 9c510 (27:4510) +_VermilionHouse2Text_560b1:: text "I'm the FISHING" line "GURU!" @@ -9,7 +9,7 @@ _VermilionHouse2Text_560b1:: ; 9c510 (27:4510) line "fish?" done -_VermilionHouse2Text_560b6:: ; 9c554 (27:4554) +_VermilionHouse2Text_560b6:: text "Grand! I like" line "your style!" @@ -21,7 +21,7 @@ _VermilionHouse2Text_560b6:: ; 9c554 (27:4554) TX_RAM wcf4b text "!@@" -_VermilionHouse2Text_560bb:: ; 9c5a4 (27:45a4) +_VermilionHouse2Text_560bb:: db $0 para "Fishing is a way" line "of life!" @@ -32,12 +32,12 @@ _VermilionHouse2Text_560bb:: ; 9c5a4 (27:45a4) cont "one, young one!" done -_VermilionHouse2Text_560c0:: ; 9c601 (27:4601) +_VermilionHouse2Text_560c0:: text "Oh... That's so" line "disappointing..." done -_VermilionHouse2Text_560c5:: ; 9c622 (27:4622) +_VermilionHouse2Text_560c5:: text "Hello there," line $52, "!" @@ -45,7 +45,7 @@ _VermilionHouse2Text_560c5:: ; 9c622 (27:4622) line "biting?" done -_VermilionHouse2Text_560ca:: ; 9c64c (27:464c) +_VermilionHouse2Text_560ca:: text "Oh no!" para "You have no room" diff --git a/text/maps/vermilion_gym_1.asm b/text/maps/vermilion_gym_1.asm index dfa45279..f718d899 100644 --- a/text/maps/vermilion_gym_1.asm +++ b/text/maps/vermilion_gym_1.asm @@ -1,25 +1,4 @@ -_VermilionGymText_5cb6d:: ; 9aaa5 (26:6aa5) -IF DEF(_YELLOW) - text "Ten-hut! Welcome" - line "to VERMILION GYM!" - - para "Will you look at" - line "that, a pint-size" - cont "challenger!" - - para "Hahaha! You've got" - line "big and brassy" - cont "nerves to take me" - cont "on with your puny" - cont "power!" - - para "A #MON battle" - line "is war! I'll show" - cont "you, civilian!" - - para "I'll shock you" - line "into surrender!" -ELSE +_VermilionGymText_5cb6d:: text "Hey, kid! What do" line "you think you're" cont "doing here?" @@ -39,5 +18,4 @@ ELSE para "The same as I'll" line "do to you!" -ENDC done diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm index ee7d14ee..e347edb9 100644 --- a/text/maps/vermilion_gym_2.asm +++ b/text/maps/vermilion_gym_2.asm @@ -1,4 +1,4 @@ -_VermilionGymText_5cb72:: ; 9c000 (27:4000) +_VermilionGymText_5cb72:: text "A little word of" line "advice, kid!" @@ -10,30 +10,26 @@ _VermilionGymText_5cb72:: ; 9c000 (27:4000) cont "type #MON!" done -_VermilionGymText_5cb77:: ; 9c069 (27:4069) +_VermilionGymText_5cb77:: text "The THUNDERBADGE" line "cranks up your" cont "#MON's SPEED!" para "It also lets your" -IF DEF(_YELLOW) - line "#MON FLY any-" -ELSE line "#MON FLY any" -ENDC cont "time, kid!" para "You're special," line "kid! Take this!" done -_ReceivedTM24Text:: ; 9c0e0 (27:40e0) +_ReceivedTM24Text:: text $52, " received " line "@" TX_RAM wcf4b text "!@@" -_TM24ExplanationText:: ; 9c0f5 (27:40f5) +_TM24ExplanationText:: db $0 para "TM24 contains" line "THUNDERBOLT!" @@ -42,12 +38,12 @@ _TM24ExplanationText:: ; 9c0f5 (27:40f5) line "electric #MON!" done -_TM24NoRoomText:: ; 9c130 (27:4130) +_TM24NoRoomText:: text "Yo kid, make room" line "in your pack!" done -_ReceivedThunderbadgeText:: ; 9c151 (27:4151) +_ReceivedThunderbadgeText:: text "Whoa!" para "You're the real" @@ -57,18 +53,18 @@ _ReceivedThunderbadgeText:: ; 9c151 (27:4151) line "the THUNDERBADGE!" prompt -_VermilionGymBattleText1:: ; 9c194 (27:4194) +_VermilionGymBattleText1:: text "When I was in the" line "Army, LT.SURGE" cont "was my strict CO!" done -_VermilionGymEndBattleText1:: ; 9c1c8 (27:41c8) +_VermilionGymEndBattleText1:: text "Stop!" line "You're very good!" prompt -_VermilionGymAfterBattleText1:: ; 9c1e0 (27:41e0) +_VermilionGymAfterBattleText1:: text "The door won't" line "open?" @@ -76,17 +72,17 @@ _VermilionGymAfterBattleText1:: ; 9c1e0 (27:41e0) line "was cautious!" done -_VermilionGymBattleText2:: ; 9c213 (27:4213) +_VermilionGymBattleText2:: text "I'm a lightweight," line "but I'm good with" cont "electricity!" done -_VermilionGymEndBattleText2:: ; 9c244 (27:4244) +_VermilionGymEndBattleText2:: text "Fried!" prompt -_VermilionGymAfterBattleText2:: ; 9c24c (27:424c) +_VermilionGymAfterBattleText2:: text "OK, I'll talk!" para "LT.SURGE said he" @@ -94,17 +90,17 @@ _VermilionGymAfterBattleText2:: ; 9c24c (27:424c) cont "inside something!" done -_VermilionGymBattleText3:: ; 9c290 (27:4290) +_VermilionGymBattleText3:: text "This is no place" line "for kids!" done -_VermilionGymEndBattleText3:: ; 9c2ac (27:42ac) +_VermilionGymEndBattleText3:: text "Wow!" line "Surprised me!" prompt -_VermilionGymAfterBattleText3:: ; 9c2c0 (27:42c0) +_VermilionGymAfterBattleText3:: text "LT.SURGE set up" line "double locks!" cont "Here's a hint!" @@ -115,7 +111,7 @@ _VermilionGymAfterBattleText3:: ; 9c2c0 (27:42c0) cont "next to it!" done -_VermilionGymText_5cbf4:: ; 9c32b (27:432b) +_VermilionGymText_5cbf4:: text "Yo! Champ in" line "making!" @@ -141,7 +137,7 @@ _VermilionGymText_5cbf4:: ; 9c32b (27:432b) cont "get to him!" done -_VermilionGymText_5cbf9:: ; 9c429 (27:4429) +_VermilionGymText_5cbf9:: text "Whew! That match" line "was electric!" done diff --git a/text/maps/vermilion_house.asm b/text/maps/vermilion_house.asm index f05f9487..806a4b8a 100644 --- a/text/maps/vermilion_house.asm +++ b/text/maps/vermilion_house.asm @@ -1,14 +1,14 @@ -_VermilionHouse1Text1:: ; 9c449 (27:4449) +_VermilionHouse1Text1:: text "I'm getting my" line "PIDGEY to fly a" cont "letter to SAFFRON" cont "in the north!" done -_VermilionHouse1Text2:: ; 9c488 (27:4488) +_VermilionHouse1Text2:: text "PIDGEY: Kurukkoo!@@" -_VermilionHouse1Text3:: ; 9c49c (27:449c) +_VermilionHouse1Text3:: text "Dear PIPPI, I hope" line "to see you soon." diff --git a/text/maps/vermilion_mart.asm b/text/maps/vermilion_mart.asm index 0fcfbcbb..9acdf905 100644 --- a/text/maps/vermilion_mart.asm +++ b/text/maps/vermilion_mart.asm @@ -1,4 +1,4 @@ -_VermilionMartText2:: ; 9a9c1 (26:69c1) +_VermilionMartText2:: text "There are evil" line "people who will" cont "use #MON for" @@ -15,7 +15,7 @@ _VermilionMartText2:: ; 9a9c1 (26:69c1) cont "useful." done -_VermilionMartText3:: ; 9aa67 (26:6a67) +_VermilionMartText3:: text "I think #MON" line "can be good or" cont "evil. It depends" diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/vermilion_pokecenter.asm index fce00e35..8ba563dc 100644 --- a/text/maps/vermilion_pokecenter.asm +++ b/text/maps/vermilion_pokecenter.asm @@ -1,5 +1,5 @@ -_VermilionPokecenterText2:: ; 9a4b2 (26:64b2) -_VermilionPokecenterText1:: ; 9a4b2 (26:64b2) +_VermilionPokecenterText2:: +_VermilionPokecenterText1:: text "Even if they are" line "the same level," cont "#MON can have" @@ -12,7 +12,7 @@ _VermilionPokecenterText1:: ; 9a4b2 (26:64b2) cont "in the wild." done -_VermilionPokecenterText3:: ; 9a539 (26:6539) +_VermilionPokecenterText3:: text "My #MON was" line "poisoned! It" cont "fainted while we" diff --git a/text/maps/victory_road_1f.asm b/text/maps/victory_road_1f.asm index b6892f43..ded9afd6 100644 --- a/text/maps/victory_road_1f.asm +++ b/text/maps/victory_road_1f.asm @@ -1,31 +1,31 @@ -_VictoryRoad1BattleText1:: ; 85c79 (21:5c79) +_VictoryRoad1BattleText1:: text "I wonder if you" line "are good enough" cont "for me!" done -_VictoryRoad1EndBattleText1:: ; 85ca2 (21:5ca2) +_VictoryRoad1EndBattleText1:: text "I" line "lost out!" prompt -_VictoryRoad1AfterBattleText1:: ; 85caf (21:5caf) +_VictoryRoad1AfterBattleText1:: text "I never wanted to" line "lose to anybody!" done -_VictoryRoad1BattleText2:: ; 85cd3 (21:5cd3) +_VictoryRoad1BattleText2:: text "I can see you're" line "good! Let me see" cont "exactly how good!" done -_VictoryRoad1EndBattleText2:: ; 85d07 (21:5d07) +_VictoryRoad1EndBattleText2:: text "I" line "had a chance..." prompt -_VictoryRoad1AfterBattleText2:: ; 85d1a (21:5d1a) +_VictoryRoad1AfterBattleText2:: text "I concede, you're" line "better than me!" done diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm index 5becd811..390d8d54 100644 --- a/text/maps/victory_road_2f.asm +++ b/text/maps/victory_road_2f.asm @@ -1,84 +1,84 @@ -_VictoryRoad2BattleText6:: ; 8d06e (23:506e) +_VictoryRoad2BattleText6:: text "Gyaoo!@@" -_VictoryRoad2BattleText1:: ; 8d077 (23:5077) +_VictoryRoad2BattleText1:: text "VICTORY ROAD is" line "the final test" cont "for trainers!" done -_VictoryRoad2EndBattleText1:: ; 8d0a5 (23:50a5) +_VictoryRoad2EndBattleText1:: text "Aiyah!" prompt -_VictoryRoad2AfterBattleText1:: ; 8d0ad (23:50ad) +_VictoryRoad2AfterBattleText1:: text "If you get stuck," line "try moving some" cont "boulders around!" done -_VictoryRoad2BattleText2:: ; 8d0e1 (23:50e1) +_VictoryRoad2BattleText2:: text "Ah, so you wish" line "to challenge the" cont "ELITE FOUR?" done -_VictoryRoad2EndBattleText2:: ; 8d10f (23:510f) +_VictoryRoad2EndBattleText2:: text "You" line "got me!" prompt -_VictoryRoad2AfterBattleText2:: ; 8d11c (23:511c) +_VictoryRoad2AfterBattleText2:: text $53, " also came" line "through here!" done -_VictoryRoad2BattleText3:: ; 8d137 (23:5137) +_VictoryRoad2BattleText3:: text "Come on!" line "I'll whip you!" done -_VictoryRoad2EndBattleText3:: ; 8d14f (23:514f) +_VictoryRoad2EndBattleText3:: text "I got" line "whipped!" prompt -_VictoryRoad2AfterBattleText3:: ; 8d15f (23:515f) +_VictoryRoad2AfterBattleText3:: text "You earned the" line "right to be on" cont "VICTORY ROAD!" done -_VictoryRoad2BattleText4:: ; 8d18c (23:518c) +_VictoryRoad2BattleText4:: text "If you can get" line "through here, you" cont "can go meet the" cont "ELITE FOUR!" done -_VictoryRoad2EndBattleText4:: ; 8d1ca (23:51ca) +_VictoryRoad2EndBattleText4:: text "No!" line "Unbelievable!" prompt -_VictoryRoad2AfterBattleText4:: ; 8d1dd (23:51dd) +_VictoryRoad2AfterBattleText4:: text "I can beat you" line "when it comes to" cont "knowledge about" cont "#MON!" done -_VictoryRoad2BattleText5:: ; 8d214 (23:5214) +_VictoryRoad2BattleText5:: text "Is VICTORY ROAD" line "too tough?" done -_VictoryRoad2EndBattleText5:: ; 8d230 (23:5230) +_VictoryRoad2EndBattleText5:: text "Well" line "done!" prompt -_VictoryRoad2AfterBattleText5:: ; 8d23c (23:523c) +_VictoryRoad2AfterBattleText5:: text "Many trainers give" line "up the challenge" cont "here." diff --git a/text/maps/victory_road_3f.asm b/text/maps/victory_road_3f.asm index 01a5841e..66364190 100644 --- a/text/maps/victory_road_3f.asm +++ b/text/maps/victory_road_3f.asm @@ -1,62 +1,62 @@ -_VictoryRoad3BattleText2:: ; 81d9b (20:5d9b) +_VictoryRoad3BattleText2:: text "I heard rumors of" line "a child prodigy!" done -_VictoryRoad3EndBattleText2:: ; 81dbf (20:5dbf) +_VictoryRoad3EndBattleText2:: text "The" line "rumors were true!" prompt -_VictoryRoad3AfterBattleText2:: ; 81dd6 (20:5dd6) +_VictoryRoad3AfterBattleText2:: text "You beat GIOVANNI" line "of TEAM ROCKET?" done -_VictoryRoad3BattleText3:: ; 81df9 (20:5df9) +_VictoryRoad3BattleText3:: text "I'll show you just" line "how good you are!" done -_VictoryRoad3EndBattleText3:: ; 81e1e (20:5e1e) +_VictoryRoad3EndBattleText3:: text "I'm" line "furious!" prompt -_VictoryRoad3AfterBattleText3:: ; 81e2b (20:5e2b) +_VictoryRoad3AfterBattleText3:: text "You showed me just" line "how good I was!" done -_VictoryRoad3BattleText4:: ; 81e4f (20:5e4f) +_VictoryRoad3BattleText4:: text "Only the chosen" line "can pass here!" done -_VictoryRoad3EndBattleText4:: ; 81e6f (20:5e6f) +_VictoryRoad3EndBattleText4:: text "I" line "don't believe it!" prompt -_VictoryRoad3AfterBattleText4:: ; 81e83 (20:5e83) +_VictoryRoad3AfterBattleText4:: text "All trainers here" line "are headed to the" cont "#MON LEAGUE!" cont "Be careful!" done -_VictoryRoad3BattleText5:: ; 81ec1 (20:5ec1) +_VictoryRoad3BattleText5:: text "Trainers live to" line "seek stronger" cont "opponents!" done -_VictoryRoad3EndBattleText5:: ; 81eec (20:5eec) +_VictoryRoad3EndBattleText5:: text "Oh!" line "So strong!" prompt -_VictoryRoad3AfterBattleText5:: ; 81efc (20:5efc) +_VictoryRoad3AfterBattleText5:: text "By fighting tough" line "battles, you get" cont "stronger!" diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index 7ff2d71d..feedd017 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -1,4 +1,4 @@ -_ViridianCityText1:: ; a43cc (29:43cc) +_ViridianCityText1:: text "Those # BALLs" line "at your waist!" cont "You have #MON!" @@ -9,7 +9,7 @@ _ViridianCityText1:: ; a43cc (29:43cc) cont "time, anywhere!" done -_ViridianCityText_19122:: ; a4437 (29:4437) +_ViridianCityText_19122:: text "This #MON GYM" line "is always closed." @@ -17,23 +17,23 @@ _ViridianCityText_19122:: ; a4437 (29:4437) line "LEADER is?" done -_ViridianCityText_19127:: ; a4474 (29:4474) +_ViridianCityText_19127:: text "VIRIDIAN GYM's" line "LEADER returned!" done -_ViridianCityText_1914d:: ; a4494 (29:4494) +_ViridianCityText_1914d:: text "You want to know" line "about the 2 kinds" cont "of caterpillar" cont "#MON?" done -_ViridianCityText_19152:: ; a44cd (29:44cd) +_ViridianCityText_19152:: text "Oh, OK then!" done -_ViridianCityText_19157:: ; a44db (29:44db) +_ViridianCityText_19157:: text "CATERPIE has no" line "poison, but" cont "WEEDLE does." @@ -42,14 +42,14 @@ _ViridianCityText_19157:: ; a44db (29:44db) line "POISON STING!" done -_ViridianCityText_19175:: ; a4525 (29:4525) +_ViridianCityText_19175:: text "Oh Grandpa! Don't" line "be so mean!" cont "He hasn't had his" cont "coffee yet." done -_ViridianCityText_1917a:: ; a4560 (29:4560) +_ViridianCityText_1917a:: text "When I go shop in" line "PEWTER CITY, I" cont "have to take the" @@ -57,7 +57,7 @@ _ViridianCityText_1917a:: ; a4560 (29:4560) cont "VIRIDIAN FOREST." done -_ViridianCityText_19191:: ; a45b5 (29:45b5) +_ViridianCityText_19191:: text "You can't go" line "through here!" @@ -65,7 +65,7 @@ _ViridianCityText_19191:: ; a45b5 (29:45b5) line "property!" done -_ViridianCityText_191ca:: ; a45ea (29:45ea) +_ViridianCityText_191ca:: text "Yawn!" line "I must have dozed" cont "off in the sun." @@ -82,22 +82,22 @@ _ViridianCityText_191ca:: ; a45ea (29:45ea) cont "have this TM." prompt -_ReceivedTM42Text:: ; a469a (29:469a) +_ReceivedTM42Text:: text $52, " received" line "TM42!@@" -_TM42Explanation:: ; a46ad (29:46ad) +_TM42Explanation:: text "TM42 contains" line "DREAM EATER..." cont "...Snore..." done -_TM42NoRoomText:: ; a46d7 (29:46d7) +_TM42NoRoomText:: text "You have too much" line "stuff already." done -_ViridianCityText_1920a:: ; a46f9 (29:46f9) +_ViridianCityText_1920a:: text "Ahh, I've had my" line "coffee now and I" cont "feel great!" @@ -109,7 +109,7 @@ _ViridianCityText_1920a:: ; a46f9 (29:46f9) line "hurry?" done -_ViridianCityText_1920f:: ; a4754 (29:4754) +_ViridianCityText_1920f:: text "I see you're using" line "a #DEX." @@ -126,24 +126,24 @@ _ViridianCityText_1920f:: ; a4754 (29:4754) line "how to then." done -_ViridianCityText_19214:: ; a47e6 (29:47e6) +_ViridianCityText_19214:: text "Time is money..." line "Go along then." done -_ViridianCityText_19219:: ; a4807 (29:4807) +_ViridianCityText_19219:: text "First, you need" line "to weaken the" cont "target #MON." done -_ViridianCityText8:: ; a4833 (29:4833) +_ViridianCityText8:: text "VIRIDIAN CITY " line "The Eternally" cont "Green Paradise" done -_ViridianCityText9:: ; a4860 (29:4860) +_ViridianCityText9:: text "TRAINER TIPS" para "Catch #MON" @@ -155,7 +155,7 @@ _ViridianCityText9:: ; a4860 (29:4860) cont "to fight!" done -_ViridianCityText10:: ; a48c3 (29:48c3) +_ViridianCityText10:: text "TRAINER TIPS" para "The battle moves" @@ -169,12 +169,12 @@ _ViridianCityText10:: ; a48c3 (29:48c3) cont "#MON CENTER!" done -_ViridianCityText13:: ; a4949 (29:4949) +_ViridianCityText13:: text "VIRIDIAN CITY" line "#MON GYM" done -_ViridianCityText14:: ; a4961 (29:4961) +_ViridianCityText14:: text "The GYM's doors" line "are locked..." done diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm index aa6ab4ab..8eaf7738 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/viridian_forest.asm @@ -1,4 +1,4 @@ -_ViridianForestText1:: ; 8031d (20:431d) +_ViridianForestText1:: text "I came here with" line "some friends!" @@ -6,57 +6,53 @@ _ViridianForestText1:: ; 8031d (20:431d) line "#MON fights!" done -_ViridianForestBattleText1:: ; 80359 (20:4359) +_ViridianForestBattleText1:: text "Hey! You have" line "#MON! Come on!" -IF DEF(_YELLOW) - cont "Let's battle 'em!" -ELSE cont "Let's battle'em!" -ENDC done -_ViridianForestEndBattleText1:: ; 80387 (20:4387) +_ViridianForestEndBattleText1:: text "No!" line "CATERPIE can't" cont "cut it!" prompt -_ViridianFrstAfterBattleText1:: ; 803a2 (20:43a2) +_ViridianFrstAfterBattleText1:: text "Ssh! You'll scare" line "the bugs away!" done -_ViridianForestBattleText2:: ; 803c3 (20:43c3) +_ViridianForestBattleText2:: text "Yo! You can't jam" line "out if you're a" cont "#MON trainer!" done -_ViridianForestEndBattleText2:: ; 803f2 (20:43f2) +_ViridianForestEndBattleText2:: text "Huh?" line "I ran out of" cont "#MON!" prompt -_ViridianFrstAfterBattleText2:: ; 8040b (20:440b) +_ViridianFrstAfterBattleText2:: text "Darn! I'm going" line "to catch some" cont "stronger ones!" done -_ViridianForestBattleText3:: ; 80438 (20:4438) +_ViridianForestBattleText3:: text "Hey, wait up!" line "What's the hurry?" done -_ViridianForestEndBattleText3:: ; 80458 (20:4458) +_ViridianForestEndBattleText3:: text "I" line "give! You're good" cont "at this!" prompt -_ViridianFrstAfterBattleText3:: ; 80475 (20:4475) +_ViridianFrstAfterBattleText3:: text "Sometimes, you" line "can find stuff on" cont "the ground!" @@ -66,43 +62,7 @@ _ViridianFrstAfterBattleText3:: ; 80475 (20:4475) cont "dropped!" done -if DEF(_YELLOW) -_ViridianForestBattleTextPikaGirl:: - text "Hi, do you have a" - line "PIKACHU?" - done - -_ViridianForestEndBattleTextPikaGirl:: - text "Oh no," - line "really?" - prompt - -_ViridianForestAfterBattleTextPikaGirl:: - text "I looked forever," - line "but I never found" - cont "a PIKACHU here!" - done - -_ViridianForestBattleTextSamurai:: - text "I'm gonna be the" - line "best. You just" - cont "can't beat me!" - done - -_ViridianForestEndBattleTextSamurai:: - text "After" - line "all I did..." - prompt - -_ViridianForestAfterBattleTextSamurai:: - text "A METAPOD is cool" - line "because its" - cont "attack is its" - cont "defense!" - done -ENDC - -_ViridianForestText8:: ; 804c7 (20:44c7) +_ViridianForestText8:: text "I ran out of #" line "BALLs to catch" cont "#MON with!" @@ -111,7 +71,7 @@ _ViridianForestText8:: ; 804c7 (20:44c7) line "extras!" done -_ViridianForestText9:: ; 8050a (20:450a) +_ViridianForestText9:: text "TRAINER TIPS" para "If you want to" @@ -120,13 +80,13 @@ _ViridianForestText9:: ; 8050a (20:450a) cont "grassy areas!" done -_ViridianForestText10:: ; 80553 (20:4553) +_ViridianForestText10:: text "For poison, use" line "ANTIDOTE! Get it" cont "at #MON MARTs!" done -_ViridianForestText11:: ; 80584 (20:4584) +_ViridianForestText11:: text "TRAINER TIPS" para "Contact PROF.OAK" @@ -135,7 +95,7 @@ _ViridianForestText11:: ; 80584 (20:4584) cont "evaluated!" done -_ViridianForestText12:: ; 805c6 (20:45c6) +_ViridianForestText12:: text "TRAINER TIPS" para "No stealing of" @@ -145,7 +105,7 @@ _ViridianForestText12:: ; 805c6 (20:45c6) cont "#MON!" done -_ViridianForestText13:: ; 80613 (20:4613) +_ViridianForestText13:: text "TRAINER TIPS" para "Weaken #MON" @@ -156,7 +116,7 @@ _ViridianForestText13:: ; 80613 (20:4613) line "they may escape!" done -_ViridianForestText14:: ; 80667 (20:4667) +_ViridianForestText14:: text "LEAVING" line "VIRIDIAN FOREST" cont "PEWTER CITY AHEAD" diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/viridian_forest_entrance.asm index 770f2b5b..c1a8df22 100644 --- a/text/maps/viridian_forest_entrance.asm +++ b/text/maps/viridian_forest_entrance.asm @@ -1,24 +1,13 @@ -_ViridianForestEntranceText1:: ; 8a868 (22:6868) +_ViridianForestEntranceText1:: text "Are you going to" line "VIRIDIAN FOREST?" cont "Be careful, it's" cont "a natural maze!" done -_ViridianForestEntranceText2:: ; 8a8ab (22:68ab) -IF DEF(_YELLOW) - text "You have to roam" - line "far to get new" - cont "kinds of #MON." - - para "Look for other" - line "types outside of" - cont "VIRIDIAN FOREST." - done -ELSE +_ViridianForestEntranceText2:: text "RATTATA may be" line "small, but its" cont "bite is wicked!" cont "Did you get one?" done -ENDC diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/viridian_forest_exit.asm index e74474e9..04dea7e5 100644 --- a/text/maps/viridian_forest_exit.asm +++ b/text/maps/viridian_forest_exit.asm @@ -1,4 +1,4 @@ -_ViridianForestExitText1:: ; 8a6fd (22:66fd) +_ViridianForestExitText1:: text "Many #MON live" line "only in forests " cont "and caves." @@ -8,7 +8,7 @@ _ViridianForestExitText1:: ; 8a6fd (22:66fd) cont "different kinds!" done -_ViridianForestExitText2:: ; 8a75d (22:675d) +_ViridianForestExitText2:: text "Have you noticed" line "the bushes on the" cont "roadside?" diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm index 10a2a597..a308681a 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/viridian_gym.asm @@ -1,4 +1,4 @@ -_ViridianGymText_74ace:: ; 95e09 (25:5e09) +_ViridianGymText_74ace:: text "Fwahahaha! This is" line "my hideout!" @@ -18,7 +18,7 @@ _ViridianGymText_74ace:: ; 95e09 (25:5e09) cont "greatest trainer!" done -_ViridianGymText_74ad3:: ; 95ed5 (25:5ed5) +_ViridianGymText_74ad3:: text "Ha!" line "That was a truly" cont "intense fight!" @@ -26,7 +26,7 @@ _ViridianGymText_74ad3:: ; 95ed5 (25:5ed5) cont "As proof, here is" cont "the EARTHBADGE!@@" -_ViridianGymText_74ad9:: ; 95f2b (25:5f2b) +_ViridianGymText_74ad9:: text "Having lost, I" line "cannot face my" cont "underlings!" @@ -38,14 +38,10 @@ _ViridianGymText_74ad9:: ; 95f2b (25:5f2b) cont "of #MON!" para "Let us meet again" -IF DEF(_YELLOW) - line "someday!" -ELSE line "some day!" -ENDC cont "Farewell!@@" -_ViridianGymText12:: ; 95fcc (25:5fcc) +_ViridianGymText12:: text "The EARTHBADGE" line "makes #MON of" cont "any level obey!" @@ -63,11 +59,11 @@ _ViridianGymText12:: ; 95fcc (25:5fcc) cont "LEAGUE challenge!" done -_ReceivedTM27Text:: ; 96082 (25:6082) +_ReceivedTM27Text:: text $52, " received" line "TM27!@@" -_TM27ExplanationText:: ; 96095 (25:6095) +_TM27ExplanationText:: db $0 para "TM27 is FISSURE!" line "It will take out" @@ -79,147 +75,143 @@ _TM27ExplanationText:: ; 96095 (25:6095) cont "too long ago..." done -_TM27NoRoomText:: ; 96104 (25:6104) +_TM27NoRoomText:: text "You do not have" line "space for this!" done -_ViridianGymBattleText1:: ; 96125 (25:6125) +_ViridianGymBattleText1:: text "Heh! You must be" line "running out of" cont "steam by now!" done -_ViridianGymEndBattleText1:: ; 96154 (25:6154) +_ViridianGymEndBattleText1:: text "I" line "ran out of gas!" prompt -_ViridianGymAfterBattleText1:: ; 96167 (25:6167) +_ViridianGymAfterBattleText1:: text "You need power to" line "keep up with our" cont "GYM LEADER!" done -_ViridianGymBattleText2:: ; 96197 (25:6197) +_ViridianGymBattleText2:: text "Rrrroar! I'm" line "working myself" cont "into a rage!" done -_ViridianGymEndBattleText2:: ; 961c0 (25:61c0) +_ViridianGymEndBattleText2:: text "Wargh!" prompt -_ViridianGymAfterBattleText2:: ; 961c8 (25:61c8) +_ViridianGymAfterBattleText2:: text "I'm still not" line "worthy!" done -_ViridianGymBattleText3:: ; 961de (25:61de) +_ViridianGymBattleText3:: text "#MON and I, we" line "make wonderful" cont "music together!" done -_ViridianGymEndBattleText3:: ; 9620d (25:620d) +_ViridianGymEndBattleText3:: text "You are in" line "perfect harmony!" prompt -_ViridianGymAfterBattleText3:: ; 9622a (25:622a) +_ViridianGymAfterBattleText3:: text "Do you know the" line "identity of our" cont "GYM LEADER?" done -_ViridianGymBattleText4:: ; 96257 (25:6257) +_ViridianGymBattleText4:: text "Karate is the" line "ultimate form of" cont "martial arts!" done -_ViridianGymEndBattleText4:: ; 96285 (25:6285) +_ViridianGymEndBattleText4:: text "Atcho!" prompt -_ViridianGymAfterBattleText4:: ; 9628d (25:628d) +_ViridianGymAfterBattleText4:: text "If my #MON" line "were as good at" cont "Karate as I..." done -_ViridianGymBattleText5:: ; 962b8 (25:62b8) +_ViridianGymBattleText5:: text "The truly talented" line "win with style!" done -_ViridianGymEndBattleText5:: ; 962dc (25:62dc) +_ViridianGymEndBattleText5:: text "I" line "lost my grip!" prompt -_ViridianGymAfterBattleText5:: ; 962ed (25:62ed) +_ViridianGymAfterBattleText5:: text "The LEADER will" line "scold me!" done -_ViridianGymBattleText6:: ; 96308 (25:6308) +_ViridianGymBattleText6:: text "I'm the KARATE" line "KING! Your fate" cont "rests with me!" done -_ViridianGymEndBattleText6:: ; 96336 (25:6336) +_ViridianGymEndBattleText6:: text "Ayah!" prompt -_ViridianGymAfterBattleText6:: ; 9633d (25:633d) +_ViridianGymAfterBattleText6:: text "#MON LEAGUE?" line "You? Don't get" cont "cocky!" done -_ViridianGymBattleText7:: ; 96360 (25:6360) +_ViridianGymBattleText7:: text "Your #MON will" line "cower at the" cont "crack of my whip!" done -_ViridianGymEndBattleText7:: ; 9638f (25:638f) +_ViridianGymEndBattleText7:: text "Yowch!" line "Whiplash!" prompt -_ViridianGymAfterBattleText7:: ; 963a1 (25:63a1) +_ViridianGymAfterBattleText7:: text "Wait! I was just" line "careless!" done -_ViridianGymBattleText8:: ; 963bd (25:63bd) +_ViridianGymBattleText8:: text "VIRIDIAN GYM was" line "closed for a long" cont "time, but now our" cont "LEADER is back!" done -_ViridianGymEndBattleText8:: ; 96403 (25:6403) +_ViridianGymEndBattleText8:: text "I" line "was beaten?" prompt -_ViridianGymAfterBattleText8:: ; 96412 (25:6412) -IF DEF(_YELLOW) - text "You can go on to" -ELSE +_ViridianGymAfterBattleText8:: text "You can go onto" -ENDC line "#MON LEAGUE" cont "only by defeating" cont "our GYM LEADER!" done -_ViridianGymText_74bd4:: ; 96451 (25:6451) +_ViridianGymText_74bd4:: text "Yo! Champ in" line "making!" @@ -237,7 +229,7 @@ _ViridianGymText_74bd4:: ; 96451 (25:6451) cont "#MON!" done -_ViridianGymText_74bd9:: ; 964fb (25:64fb) +_ViridianGymText_74bd9:: text "Blow me away!" line "GIOVANNI was the" cont "GYM LEADER here?" diff --git a/text/maps/viridian_house.asm b/text/maps/viridian_house.asm index eec10c59..5adf059b 100644 --- a/text/maps/viridian_house.asm +++ b/text/maps/viridian_house.asm @@ -1,4 +1,4 @@ -_ViridianHouseText1:: ; 95d71 (25:5d71) +_ViridianHouseText1:: text "Coming up with" line "nicknames is fun," cont "but hard." @@ -8,16 +8,16 @@ _ViridianHouseText1:: ; 95d71 (25:5d71) cont "remember." done -_ViridianHouseText2:: ; 95dc7 (25:5dc7) +_ViridianHouseText2:: text "My Daddy loves" line "#MON too." done -_ViridianHouseText_1d5b1:: ; 95de1 (25:5de1) +_ViridianHouseText_1d5b1:: text "SPEARY: Tetweet!" done -_ViridianHouseText4:: ; 95df3 (25:5df3) +_ViridianHouseText4:: text "SPEAROW" line "Name: SPEARY" done diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm index ed3343f1..4b569dfe 100644 --- a/text/maps/viridian_mart.asm +++ b/text/maps/viridian_mart.asm @@ -1,5 +1,5 @@ -_ViridianPokeCenterText2:: ; 95ba1 (25:5ba1) -_ViridianPokeCenterText1:: ; 95ba1 (25:5ba1) +_ViridianPokeCenterText2:: +_ViridianPokeCenterText1:: text "You can use that" line "PC in the corner." @@ -7,7 +7,7 @@ _ViridianPokeCenterText1:: ; 95ba1 (25:5ba1) line "told me. So kind!" done -_ViridianPokeCenterText3:: ; 95be8 (25:5be8) +_ViridianPokeCenterText3:: text "There's a #MON" line "CENTER in every" cont "town ahead." @@ -16,17 +16,17 @@ _ViridianPokeCenterText3:: ; 95be8 (25:5be8) line "any money either!" done -_ViridianMartText1:: ; 95c36 (25:5c36) +_ViridianMartText1:: text "Okay! Say hi to" line "PROF.OAK for me!" done -_ViridianMartText4:: ; 95c58 (25:5c58) +_ViridianMartText4:: text "Hey! You came from" line "PALLET TOWN?" done -ViridianMartParcelQuestText:: ; 95c79 (25:5c79) +ViridianMartParcelQuestText:: text "You know PROF." line "OAK, right?" @@ -37,24 +37,12 @@ ViridianMartParcelQuestText:: ; 95c79 (25:5c79) para $52, " got" line "OAK's PARCEL!@@" -_ViridianMartText2:: ; 95cd5 (25:5cd5) -IF DEF(_YELLOW) - text "This shop sells a" - line "lot of PARLYZ" - cont "HEALs." -ELSE +_ViridianMartText2:: text "This shop sells" line "many ANTIDOTEs." -ENDC done -_ViridianMartText3:: ; 95cf6 (25:5cf6) -IF DEF(_YELLOW) - text "The shop finally" - line "has some POTIONs" - cont "in stock." -ELSE +_ViridianMartText3:: text "No! POTIONs are" line "all sold out." -ENDC done diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm index a215da34..09ab1443 100644 --- a/text/maps/wardens_house.asm +++ b/text/maps/wardens_house.asm @@ -1,4 +1,4 @@ -_WardenGibberishText1:: ; 9e444 (27:6444) +_WardenGibberishText1:: text "WARDEN: Hif fuff" line "hefifoo!" @@ -7,28 +7,28 @@ _WardenGibberishText1:: ; 9e444 (27:6444) cont "hee fwee!" done -_WardenGibberishText2:: ; 9e48b (27:648b) +_WardenGibberishText2:: text "Ah howhee ho hoo!" line "Eef ee hafahi ho!" done -_WardenGibberishText3:: ; 9e4b0 (27:64b0) +_WardenGibberishText3:: text "Ha? He ohay heh" line "ha hoo ee haheh!" done -_WardenTeethText1:: ; 9e4d2 (27:64d2) +_WardenTeethText1:: text $52, " gave the" line "GOLD TEETH to the" cont "WARDEN!@@" -_WardenTeethText2:: ; 9e4f9 (27:64f9) +_WardenTeethText2:: db $0 para "The WARDEN popped" line "in his teeth!" prompt -_WardenThankYouText:: ; 9e51b (27:651b) +_WardenThankYouText:: text "WARDEN: Thanks," line "kid! No one could" cont "understand a word" @@ -41,13 +41,13 @@ _WardenThankYouText:: ; 9e51b (27:651b) cont "your trouble." prompt -_ReceivedHM04Text:: ; 9e5a2 (27:65a2) +_ReceivedHM04Text:: text $52, " received" line "@" TX_RAM wcf4b text "!@@" -_HM04ExplanationText:: ; 9e5b6 (27:65b6) +_HM04ExplanationText:: text "WARDEN: HM04" line "teaches STRENGTH!" @@ -67,17 +67,17 @@ _HM04ExplanationText:: ; 9e5b6 (27:65b6) line "rare SURF HM." done -_HM04NoRoomText:: ; 9e67a (27:667a) +_HM04NoRoomText:: text "Your pack is" line "stuffed full!" done -_FuchsiaHouse2Text_75176:: ; 9e696 (27:6696) +_FuchsiaHouse2Text_75176:: text "#MON photos" line "and fossils." done -_FuchsiaHouse2Text_7517b:: ; 9e6b0 (27:66b0) +_FuchsiaHouse2Text_7517b:: text "Old #MON" line "merchandise." done -- cgit v1.3.1-sl0p From 94e609b4bcbb0c6469a2fa0b3ba235d776e269ef Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Sun, 6 Dec 2015 14:20:26 -0700 Subject: vertical space is cheap. also remove address comments and yellow ifs. --- data/trainer_parties.asm | 282 ++++++++++++++++------------------------------- 1 file changed, 94 insertions(+), 188 deletions(-) diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index b121efc0..b521fe95 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -1,14 +1,51 @@ TrainerDataPointers: ; 39d3b (e:5d3b) - dw YoungsterData,BugCatcherData,LassData,SailorData,JrTrainerMData - dw JrTrainerFData,PokemaniacData,SuperNerdData,HikerData,BikerData - dw BurglarData,EngineerData,Juggler1Data,FisherData,SwimmerData - dw CueBallData,GamblerData,BeautyData,PsychicData,RockerData - dw JugglerData,TamerData,BirdKeeperData,BlackbeltData,Green1Data - dw ProfOakData,ChiefData,ScientistData,GiovanniData,RocketData - dw CooltrainerMData,CooltrainerFData,BrunoData,BrockData,MistyData - dw LtSurgeData,ErikaData,KogaData,BlaineData,SabrinaData - dw GentlemanData,Green2Data,Green3Data,LoreleiData,ChannelerData - dw AgathaData,LanceData + dw YoungsterData + dw BugCatcherData + dw LassData + dw SailorData + dw JrTrainerMData + dw JrTrainerFData + dw PokemaniacData + dw SuperNerdData + dw HikerData + dw BikerData + dw BurglarData + dw EngineerData + dw Juggler1Data + dw FisherData + dw SwimmerData + dw CueBallData + dw GamblerData + dw BeautyData + dw PsychicData + dw RockerData + dw JugglerData + dw TamerData + dw BirdKeeperData + dw BlackbeltData + dw Green1Data + dw ProfOakData + dw ChiefData + dw ScientistData + dw GiovanniData + dw RocketData + dw CooltrainerMData + dw CooltrainerFData + dw BrunoData + dw BrockData + dw MistyData + dw LtSurgeData + dw ErikaData + dw KogaData + dw BlaineData + dw SabrinaData + dw GentlemanData + dw Green2Data + dw Green3Data + dw LoreleiData + dw ChannelerData + dw AgathaData + dw LanceData ; if first byte != FF, then ; first byte is level (of all pokemon on this team) @@ -19,7 +56,7 @@ TrainerDataPointers: ; 39d3b (e:5d3b) ; every next two bytes are a level and species ; null-terminated -YoungsterData: ; 39d99 (e:5d99) +YoungsterData: db 11,RATTATA,EKANS,0 db 14,SPEAROW,0 db 10,RATTATA,RATTATA,ZUBAT,0 @@ -33,19 +70,10 @@ YoungsterData: ; 39d99 (e:5d99) db 17,RATTATA,RATTATA,RATICATE,0 db 18,NIDORAN_M,NIDORINO,0 db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 -if DEF(_YELLOW) - db 24,SANDSHREW,0 -endc -BugCatcherData: ; 39dce (e:5dce) -if DEF(_YELLOW) - db 7,CATERPIE,CATERPIE,0 - db 6,METAPOD,CATERPIE,METAPOD,0 - db 10,CATERPIE,0 -else +BugCatcherData: db 6,WEEDLE,CATERPIE,0 db 7,WEEDLE,KAKUNA,WEEDLE,0 db 9,WEEDLE,0 -endc db 10,CATERPIE,WEEDLE,CATERPIE,0 db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0 db 11,CATERPIE,METAPOD,0 @@ -57,10 +85,7 @@ endc db 18,METAPOD,CATERPIE,VENONAT,0 db 19,BEEDRILL,BEEDRILL,0 db 20,CATERPIE,WEEDLE,VENONAT,0 -if DEF(_YELLOW) - db 8,CATERPIE,METAPOD,0 -endc -LassData: ; 39e0c (e:5e0c) +LassData: db 9,PIDGEY,PIDGEY,0 db 10,RATTATA,NIDORAN_M,0 db 14,JIGGLYPUFF,0 @@ -72,25 +97,14 @@ LassData: ; 39e0c (e:5e0c) db 15,NIDORAN_M,NIDORAN_F,0 db 13,ODDISH,PIDGEY,ODDISH,0 db 18,PIDGEY,NIDORAN_F,0 -if DEF(_YELLOW) - db 20,JIGGLYPUFF,0 -else db 18,RATTATA,PIKACHU,0 -endc db 23,NIDORAN_F,NIDORINA,0 db 24,MEOWTH,MEOWTH,MEOWTH,0 -if DEF(_YELLOW) - db 19,PIDGEY,RATTATA,NIDORAN_F,MEOWTH,NIDORAN_M,0 -else db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0 -endc db 22,CLEFAIRY,CLEFAIRY,0 db 23,BELLSPROUT,WEEPINBELL,0 db 23,ODDISH,GLOOM,0 -if DEF(_YELLOW) - db 6,NIDORAN_F,NIDORAN_M,0 -endc -SailorData: ; 39e58 (e:5e58) +SailorData: db 18,MACHOP,SHELLDER,0 db 17,MACHOP,TENTACOOL,0 db 21,SHELLDER,0 @@ -98,17 +112,9 @@ SailorData: ; 39e58 (e:5e58) db 18,TENTACOOL,STARYU,0 db 17,HORSEA,HORSEA,HORSEA,0 db 20,MACHOP,0 -if DEF(_YELLOW) - db 24,MAGNEMITE,0 -else db 21,PIKACHU,PIKACHU,0 -endc -JrTrainerMData: ; 39e78 (e:5e78) -if DEF(_YELLOW) - db 9,DIGLETT,SANDSHREW,0 -else +JrTrainerMData: db 11,DIGLETT,SANDSHREW,0 -endc db 14,RATTATA,EKANS,0 db 18,MANKEY,0 db 20,SQUIRTLE,0 @@ -117,34 +123,19 @@ endc db 21,GROWLITHE,CHARMANDER,0 db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0 db 29,NIDORAN_M,NIDORINO,0 -if DEF(_YELLOW) - db 16,WEEPINBELL,0 -endc -JrTrainerFData: ; 39e9d (e:5e9d) +JrTrainerFData: db 19,GOLDEEN,0 -if DEF(_YELLOW) - db 16,ODDISH,BELLSPROUT,0 -else db 16,RATTATA,PIKACHU,0 -endc db 16,PIDGEY,PIDGEY,PIDGEY,0 db 22,BULBASAUR,0 db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 23,MEOWTH,0 -if DEF(_YELLOW) - db 20,JIGGLYPUFF,CLEFAIRY,0 -else db 20,PIKACHU,CLEFAIRY,0 -endc db 21,PIDGEY,PIDGEOTTO,0 db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0 db 22,ODDISH,BULBASAUR,0 db 24,BULBASAUR,IVYSAUR,0 -if DEF(_YELLOW) - db 24,PIDGEY,MEOWTH,RATTATA,PIDGEY,MEOWTH,0 -else db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0 -endc db 30,POLIWAG,POLIWAG,0 db 27,PIDGEY,MEOWTH,PIDGEY,PIDGEOTTO,0 db 28,GOLDEEN,POLIWAG,HORSEA,0 @@ -153,18 +144,11 @@ endc db 20,MEOWTH,ODDISH,PIDGEY,0 db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0 db 28,GLOOM,ODDISH,ODDISH,0 -if DEF(_YELLOW) - db 29,PIDGEY,PIDGEOTTO,0 -else db 29,PIKACHU,RAICHU,0 -endc db 33,CLEFAIRY,0 db 29,BELLSPROUT,ODDISH,TANGELA,0 db 30,TENTACOOL,HORSEA,SEEL,0 -if DEF(_YELLOW) - db 20,CUBONE,0 -endc -PokemaniacData: ; 39f09 (e:5f09) +PokemaniacData: db 30,RHYHORN,LICKITUNG,0 db 20,CUBONE,SLOWPOKE,0 db 20,SLOWPOKE,SLOWPOKE,SLOWPOKE,0 @@ -172,7 +156,7 @@ PokemaniacData: ; 39f09 (e:5f09) db 25,SLOWPOKE,0 db 40,CHARMELEON,LAPRAS,LICKITUNG,0 db 23,CUBONE,SLOWPOKE,0 -SuperNerdData: ; 39f26 (e:5f26) +SuperNerdData: db 11,MAGNEMITE,VOLTORB,0 db 12,GRIMER,VOLTORB,KOFFING,0 db 20,VOLTORB,KOFFING,VOLTORB,MAGNEMITE,0 @@ -185,7 +169,7 @@ SuperNerdData: ; 39f26 (e:5f26) db 34,PONYTA,CHARMANDER,VULPIX,GROWLITHE,0 db 41,RAPIDASH,0 db 37,GROWLITHE,VULPIX,0 -HikerData: ; 39f5e (e:5f5e) +HikerData: db 10,GEODUDE,GEODUDE,ONIX,0 db 15,MACHOP,GEODUDE,0 db 13,GEODUDE,GEODUDE,MACHOP,GEODUDE,0 @@ -200,7 +184,7 @@ HikerData: ; 39f5e (e:5f5e) db 19,GEODUDE,MACHOP,GEODUDE,GEODUDE,0 db 20,ONIX,ONIX,GEODUDE,0 db 21,GEODUDE,GRAVELER,0 -BikerData: ; 39f9c (e:5f9c) +BikerData: db 28,KOFFING,KOFFING,KOFFING,0 db 29,KOFFING,GRIMER,0 db 25,KOFFING,KOFFING,WEEZING,KOFFING,GRIMER,0 @@ -216,7 +200,7 @@ BikerData: ; 39f9c (e:5f9c) db 26,KOFFING,KOFFING,GRIMER,KOFFING,0 db 28,GRIMER,GRIMER,KOFFING,0 db 29,KOFFING,MUK,0 -BurglarData: ; 39fe4 (e:5fe4) +BurglarData: db 29,GROWLITHE,VULPIX,0 db 33,GROWLITHE,0 db 28,VULPIX,CHARMANDER,PONYTA,0 @@ -226,13 +210,13 @@ BurglarData: ; 39fe4 (e:5fe4) db 34,CHARMANDER,CHARMELEON,0 db 38,NINETALES,0 db 34,GROWLITHE,PONYTA,0 -EngineerData: ; 3a007 (e:6007) +EngineerData: db 21,VOLTORB,MAGNEMITE,0 db 21,MAGNEMITE,0 db 18,MAGNEMITE,MAGNEMITE,MAGNETON,0 -Juggler1Data: ; 3a013 (e:6013) +Juggler1Data: ; none -FisherData: ; 3a013 (e:6013) +FisherData: db 17,GOLDEEN,TENTACOOL,GOLDEEN,0 db 17,TENTACOOL,STARYU,SHELLDER,0 db 22,GOLDEEN,POLIWAG,GOLDEEN,0 @@ -244,7 +228,7 @@ FisherData: ; 3a013 (e:6013) db 27,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,0 db 33,SEAKING,GOLDEEN,0 db 24,MAGIKARP,MAGIKARP,0 -SwimmerData: ; 3a049 (e:6049) +SwimmerData: db 16,HORSEA,SHELLDER,0 db 30,TENTACOOL,SHELLDER,0 db 29,GOLDEEN,HORSEA,STARYU,0 @@ -260,7 +244,7 @@ SwimmerData: ; 3a049 (e:6049) db 37,STARMIE,0 db 33,STARYU,WARTORTLE,0 db 32,POLIWHIRL,TENTACOOL,SEADRA,0 -CueBallData: ; 3a08d (e:608d) +CueBallData: db 28,MACHOP,MANKEY,MACHOP,0 db 29,MANKEY,MACHOP,0 db 33,MACHOP,0 @@ -270,7 +254,7 @@ CueBallData: ; 3a08d (e:608d) db 26,MANKEY,MANKEY,MACHOKE,MACHOP,0 db 29,PRIMEAPE,MACHOKE,0 db 31,TENTACOOL,TENTACOOL,TENTACRUEL,0 -GamblerData: ; 3a0b3 (e:60b3) +GamblerData: db 18,POLIWAG,HORSEA,0 db 18,BELLSPROUT,ODDISH,0 db 18,VOLTORB,MAGNEMITE,0 @@ -278,15 +262,11 @@ GamblerData: ; 3a0b3 (e:60b3) db 22,POLIWAG,POLIWAG,POLIWHIRL,0 db 22,ONIX,GEODUDE,GRAVELER,0 db 24,GROWLITHE,VULPIX,0 -BeautyData: ; 3a0d1 (e:60d1) +BeautyData: db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 24,BELLSPROUT,BELLSPROUT,0 db 26,EXEGGCUTE,0 -if DEF(_YELLOW) - db 27,RATTATA,VULPIX,RATTATA,0 -else db 27,RATTATA,PIKACHU,RATTATA,0 -endc db 29,CLEFAIRY,MEOWTH,0 db 35,SEAKING,0 db 30,SHELLDER,SHELLDER,CLOYSTER,0 @@ -298,19 +278,15 @@ endc db 30,GOLDEEN,SEAKING,0 db 29,STARYU,STARYU,STARYU,0 db 30,SEADRA,HORSEA,SEADRA,0 -PsychicData: ; 3a115 (e:6115) +PsychicData: db 31,KADABRA,SLOWPOKE,MR_MIME,KADABRA,0 db 34,MR_MIME,KADABRA,0 db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0 db 38,SLOWBRO,0 -RockerData: ; 3a127 (e:6127) -if DEF(_YELLOW) - db 20,VOLTORB,VOLTORB,VOLTORB,0 -else +RockerData: db 20,VOLTORB,MAGNEMITE,VOLTORB,0 -endc db 29,VOLTORB,ELECTRODE,0 -JugglerData: ; 3a130 (e:6130) +JugglerData: db 29,KADABRA,MR_MIME,0 db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 @@ -319,14 +295,14 @@ JugglerData: ; 3a130 (e:6130) db 33,HYPNO,0 db 38,HYPNO,0 db 34,DROWZEE,KADABRA,0 -TamerData: ; 3a151 (e:6151) +TamerData: db 34,SANDSLASH,ARBOK,0 db 33,ARBOK,SANDSLASH,ARBOK,0 db 43,RHYHORN,0 db 39,ARBOK,TAUROS,0 db 44,PERSIAN,GOLDUCK,0 db 42,RHYHORN,PRIMEAPE,ARBOK,TAUROS,0 -BirdKeeperData: ; 3a16b (e:616b) +BirdKeeperData: db 29,PIDGEY,PIDGEOTTO,0 db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0 db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0 @@ -344,7 +320,7 @@ BirdKeeperData: ; 3a16b (e:616b) db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0 db 29,PIDGEOTTO,FEAROW,0 db 28,SPEAROW,DODUO,FEAROW,0 -BlackbeltData: ; 3a1be (e:61be) +BlackbeltData: db 37,HITMONLEE,HITMONCHAN,0 db 31,MANKEY,MANKEY,PRIMEAPE,0 db 32,MACHOP,MACHOKE,0 @@ -354,12 +330,7 @@ BlackbeltData: ; 3a1be (e:61be) db 43,MACHOKE,0 db 38,MACHOKE,MACHOP,MACHOKE,0 db 43,MACHOKE,MACHOP,MACHOKE,0 -Green1Data: ; 3a1e4 (e:61e4) -if DEF(_YELLOW) - db 5,EEVEE,0 - db $FF,9,SPEAROW,8,EEVEE,0 - db $FF,18,SPEAROW,15,SANDSHREW,15,RATTATA,17,EEVEE,0 -else +Green1Data: db 5,SQUIRTLE,0 db 5,BULBASAUR,0 db 5,CHARMANDER,0 @@ -369,14 +340,13 @@ else db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0 db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0 db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0 -endc -ProfOakData: ; 3a21d (e:621d) +ProfOakData: db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0 db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0 db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,CHARIZARD,70,GYARADOS,0 -ChiefData: ; 3a241 (e:6241) +ChiefData: ; none -ScientistData: ; 3a241 (e:6241) +ScientistData: db 34,KOFFING,VOLTORB,0 db 26,GRIMER,WEEZING,KOFFING,WEEZING,0 db 28,MAGNEMITE,VOLTORB,MAGNETON,0 @@ -390,17 +360,11 @@ ScientistData: ; 3a241 (e:6241) db 29,MAGNEMITE,KOFFING,0 db 33,MAGNEMITE,MAGNETON,VOLTORB,0 db 34,MAGNEMITE,ELECTRODE,0 -GiovanniData: ; 3a27e (e:627e) -if DEF(_YELLOW) - db $FF,25,ONIX,24,RHYHORN,29,PERSIAN,0 - db $FF,37,NIDORINO,35,PERSIAN,37,RHYHORN,41,NIDOQUEEN,0 - db $FF,50,DUGTRIO,53,PERSIAN,53,NIDOQUEEN,55,NIDOKING,55,RHYDON,0 -else +GiovanniData: db $FF,25,ONIX,24,RHYHORN,29,KANGASKHAN,0 db $FF,37,NIDORINO,35,KANGASKHAN,37,RHYHORN,41,NIDOQUEEN,0 db $FF,45,RHYHORN,42,DUGTRIO,44,NIDOQUEEN,45,NIDOKING,50,RHYDON,0 -endc -RocketData: ; 3a29c (e:629c) +RocketData: db 13,RATTATA,ZUBAT,0 db 11,SANDSHREW,RATTATA,ZUBAT,0 db 12,ZUBAT,EKANS,0 @@ -442,18 +406,7 @@ RocketData: ; 3a29c (e:629c) db 33,MACHOKE,0 db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0 db 32,CUBONE,DROWZEE,MAROWAK,0 -if DEF(_YELLOW) -JessieJamesData: - db 14,EKANS,MEOWTH,KOFFING,0 - db 25,KOFFING,MEOWTH,EKANS,0 - db 27,MEOWTH,ARBOK,WEEZING,0 - db 31,WEEZING,ARBOK,MEOWTH,0 - db 16,KOFFING,0 - db 27,KOFFING,0 - db 29,WEEZING,0 - db 33,WEEZING,0 -endc -CooltrainerMData: ; 3a35a (e:635a) +CooltrainerMData: db 39,NIDORINO,NIDOKING,0 db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0 db 43,KINGLER,TENTACRUEL,BLASTOISE,0 @@ -464,7 +417,7 @@ CooltrainerMData: ; 3a35a (e:635a) db 44,KINGLER,CLOYSTER,0 db 39,SANDSLASH,DUGTRIO,0 db 43,RHYHORN,0 -CooltrainerFData: ; 3a385 (e:6385) +CooltrainerFData: db 24,WEEPINBELL,GLOOM,IVYSAUR,0 db 43,BELLSPROUT,WEEPINBELL,VICTREEBEL,0 db 43,PARASECT,DEWGONG,CHANSEY,0 @@ -473,69 +426,29 @@ CooltrainerFData: ; 3a385 (e:6385) db 45,IVYSAUR,VENUSAUR,0 db 45,NIDORINA,NIDOQUEEN,0 db 43,PERSIAN,NINETALES,RAICHU,0 -BrunoData: ; 3a3a9 (e:63a9) +BrunoData: db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0 -BrockData: ; 3a3b5 (e:63b5) -if DEF(_YELLOW) - db $FF,10,GEODUDE,12,ONIX,0 -else +BrockData: db $FF,12,GEODUDE,14,ONIX,0 -endc -MistyData: ; 3a3bb (e:63bb) +MistyData: db $FF,18,STARYU,21,STARMIE,0 -LtSurgeData: ; 3a3c1 (e:63c1) -if DEF(_YELLOW) - db $FF,28,RAICHU,0 -else +LtSurgeData: db $FF,21,VOLTORB,18,PIKACHU,24,RAICHU,0 -endc -ErikaData: ; 3a3c9 (e:63c9) -if DEF(_YELLOW) - db $FF,30,TANGELA,32,WEEPINBELL,32,GLOOM,0 -else +ErikaData: db $FF,29,VICTREEBEL,24,TANGELA,29,VILEPLUME,0 -endc -KogaData: ; 3a3d1 (e:63d1) -if DEF(_YELLOW) - db $FF,44,VENONAT,46,VENONAT,48,VENONAT,50,VENOMOTH,0 -else +KogaData: db $FF,37,KOFFING,39,MUK,37,KOFFING,43,WEEZING,0 -endc -BlaineData: ; 3a3db (e:63db) -if DEF(_YELLOW) - db $FF,48,NINETALES,50,RAPIDASH,54,ARCANINE,0 -else +BlaineData: db $FF,42,GROWLITHE,40,PONYTA,42,RAPIDASH,47,ARCANINE,0 -endc -SabrinaData: ; 3a3e5 (e:63e5) -if DEF(_YELLOW) - db $FF,50,ABRA,50,KADABRA,50,ALAKAZAM,0 -else +SabrinaData: db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0 -endc -GentlemanData: ; 3a3ef (e:63ef) +GentlemanData: db 18,GROWLITHE,GROWLITHE,0 db 19,NIDORAN_M,NIDORAN_F,0 -if DEF(_YELLOW) - db 22,VOLTORB,MAGNEMITE,0 -else db 23,PIKACHU,0 -endc db 48,PRIMEAPE,0 db 17,GROWLITHE,PONYTA,0 -Green2Data: ; 3a401 (e:6401) -if DEF(_YELLOW) - db $FF,19,SPEAROW,16,RATTATA,18,SANDSHREW,20,EEVEE,0 - db $FF,25,FEAROW,23,SHELLDER,22,VULPIX,20,SANDSHREW,25,EEVEE,0 - db $FF,25,FEAROW,23,MAGNEMITE,22,SHELLDER,20,SANDSHREW,25,EEVEE,0 - db $FF,25,FEAROW,23,VULPIX,22,MAGNEMITE,20,SANDSHREW,25,EEVEE,0 - db $FF,38,SANDSLASH,35,NINETALES,37,CLOYSTER,35,KADABRA,40,JOLTEON,0 - db $FF,38,SANDSLASH,35,CLOYSTER,37,MAGNETON,35,KADABRA,40,FLAREON,0 - db $FF,38,SANDSLASH,35,MAGNETON,37,NINETALES,35,KADABRA,40,VAPOREON,0 - db $FF,47,SANDSLASH,45,EXEGGCUTE,45,NINETALES,47,CLOYSTER,50,KADABRA,53,JOLTEON,0 - db $FF,47,SANDSLASH,45,EXEGGCUTE,45,CLOYSTER,47,MAGNETON,50,KADABRA,53,FLAREON,0 - db $FF,47,SANDSLASH,45,EXEGGCUTE,45,MAGNETON,47,NINETALES,50,KADABRA,53,VAPOREON,0 -else +Green2Data: db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0 db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0 db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0 @@ -548,20 +461,13 @@ else db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0 db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0 db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0 -endc -Green3Data: ; 3a491 (e:6491) -if DEF(_YELLOW) - db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,CLOYSTER,63,NINETALES,65,JOLTEON,0 - db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,MAGNETON,63,CLOYSTER,65,FLAREON,0 - db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,NINETALES,63,MAGNETON,65,VAPOREON,0 -else +Green3Data: db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,BLASTOISE,0 db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,VENUSAUR,0 db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,CHARIZARD,0 -endc -LoreleiData: ; 3a4bb (e:64bb) +LoreleiData: db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0 -ChannelerData: ; 3a4c7 (e:64c7) +ChannelerData: db 22,GASTLY,0 db 24,GASTLY,0 db 23,GASTLY,GASTLY,0 @@ -586,7 +492,7 @@ ChannelerData: ; 3a4c7 (e:64c7) db 34,GASTLY,HAUNTER,0 db 38,HAUNTER,0 db 33,GASTLY,GASTLY,HAUNTER,0 -AgathaData: ; 3a516 (e:6516) +AgathaData: db $FF,56,GENGAR,56,GOLBAT,55,HAUNTER,58,ARBOK,60,GENGAR,0 -LanceData: ; 3a522 (e:6522) +LanceData: db $FF,58,GYARADOS,56,DRAGONAIR,56,DRAGONAIR,60,AERODACTYL,62,DRAGONITE,0 -- cgit v1.3.1-sl0p From 4c5c791264be9d3d59a067eb3f8cab4cfac91bdc Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Sun, 6 Dec 2015 20:52:46 -0700 Subject: Define text banks relative to the first one. Clean up address comments. --- text.asm | 1160 ++++++++++++++++++++++++++------------------------------------ 1 file changed, 490 insertions(+), 670 deletions(-) diff --git a/text.asm b/text.asm index 7bec0f4e..f5b4b903 100644 --- a/text.asm +++ b/text.asm @@ -1,18 +1,18 @@ TEXT_1 EQU $20 -TEXT_2 EQU $21 -TEXT_3 EQU $22 -TEXT_4 EQU $23 -TEXT_5 EQU $24 -TEXT_6 EQU $25 -TEXT_7 EQU $26 -TEXT_8 EQU $27 -TEXT_9 EQU $28 -TEXT_10 EQU $29 -TEXT_11 EQU $2a - -POKEDEX_TEXT EQU $2b -MOVE_NAMES EQU $2c +TEXT_2 EQU TEXT_1 + 1 +TEXT_3 EQU TEXT_2 + 1 +TEXT_4 EQU TEXT_3 + 1 +TEXT_5 EQU TEXT_4 + 1 +TEXT_6 EQU TEXT_5 + 1 +TEXT_7 EQU TEXT_6 + 1 +TEXT_8 EQU TEXT_7 + 1 +TEXT_9 EQU TEXT_8 + 1 +TEXT_10 EQU TEXT_9 + 1 +TEXT_11 EQU TEXT_10 + 1 + +POKEDEX_TEXT EQU TEXT_11 + 1 +MOVE_NAMES EQU POKEDEX_TEXT + 1 INCLUDE "macros.asm" INCLUDE "hram.asm" @@ -20,75 +20,75 @@ INCLUDE "hram.asm" SECTION "Text 1", ROMX, BANK[TEXT_1] -_CardKeySuccessText1:: ; 80000 (20:4000) +_CardKeySuccessText1:: text "Bingo!@@" -_CardKeySuccessText2:: ; 80009 (20:4009) +_CardKeySuccessText2:: db $0 line "The CARD KEY" cont "opened the door!" done -_CardKeyFailText:: ; 80029 (20:4029) +_CardKeyFailText:: text "Darn! It needs a" line "CARD KEY!" done -_TrainerNameText:: ; 80045 (20:4045) +_TrainerNameText:: TX_RAM wcd6d text ": @@" -_NoNibbleText:: ; 8004d (20:404d) +_NoNibbleText:: text "Not even a nibble!" prompt -_NothingHereText:: ; 80061 (20:4061) +_NothingHereText:: text "Looks like there's" line "nothing here." prompt -_ItsABiteText:: ; 80082 (20:4082) +_ItsABiteText:: text "Oh!" line "It's a bite!" prompt -_ExclamationText:: ; 80093 (20:4093) +_ExclamationText:: text "!" done -_GroundRoseText:: ; 80096 (20:4096) +_GroundRoseText:: text "Ground rose up" line "somewhere!" done -_BoulderText:: ; 800b1 (20:40b1) +_BoulderText:: text "This requires" line "STRENGTH to move!" done -_MartSignText:: ; 800d2 (20:40d2) +_MartSignText:: text "All your item" line "needs fulfilled!" cont "#MON MART" done -_PokeCenterSignText:: ; 800fc (20:40fc) +_PokeCenterSignText:: text "Heal Your #MON!" line "#MON CENTER" done -_FoundItemText:: ; 80119 (20:4119) +_FoundItemText:: text $52, " found" line "@" TX_RAM wcf4b text "!@@" -_NoMoreRoomForItemText:: ; 8012a (20:412a) +_NoMoreRoomForItemText:: text "No more room for" line "items!" done -_OaksAideHiText:: ; 80143 (20:4143) +_OaksAideHiText:: text "Hi! Remember me?" line "I'm PROF.OAK's" cont "AIDE!" @@ -111,7 +111,7 @@ _OaksAideHiText:: ; 80143 (20:4143) cont "#MON?" done -_OaksAideUhOhText:: ; 801e4 (20:41e4) +_OaksAideUhOhText:: text "Let's see..." line "Uh-oh! You have" cont "caught only @" @@ -128,7 +128,7 @@ _OaksAideUhOhText:: ; 801e4 (20:41e4) text "." done -_OaksAideComeBackText:: ; 80250 (20:4250) +_OaksAideComeBackText:: text "Oh. I see." para "When you get @" @@ -140,7 +140,7 @@ _OaksAideComeBackText:: ; 80250 (20:4250) text "." done -_OaksAideHereYouGoText:: ; 8028c (20:428c) +_OaksAideHereYouGoText:: text "Great! You have" line "caught @" TX_NUM hOaksAideNumMonsOwned, 1, 3 @@ -151,13 +151,13 @@ _OaksAideHereYouGoText:: ; 8028c (20:428c) para "Here you go!" prompt -_OaksAideGotItemText:: ; 802d9 (20:42d9) +_OaksAideGotItemText:: text $52, " got the" line "@" TX_RAM wOaksAideRewardItemName text "!@@" -_OaksAideNoRoomText:: ; 802ec (20:42ec) +_OaksAideNoRoomText:: text "Oh! I see you" line "don't have any" cont "room for the" @@ -166,13 +166,6 @@ _OaksAideNoRoomText:: ; 802ec (20:42ec) text "." done -IF DEF(_YELLOW) -_NurseChanseyText:: - text "CHANSEY: Chaaan" - line "sey!" - done -ENDC - INCLUDE "text/maps/viridian_forest.asm" INCLUDE "text/maps/mt_moon_1f.asm" INCLUDE "text/maps/mt_moon_b1f.asm" @@ -242,7 +235,7 @@ INCLUDE "text/maps/seafoam_islands_b2f.asm" INCLUDE "text/maps/seafoam_islands_b3f.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" -_AIBattleWithdrawText:: ; 880be (22:40be) +_AIBattleWithdrawText:: TX_RAM wTrainerName text " with-" line "drew @" @@ -250,7 +243,7 @@ _AIBattleWithdrawText:: ; 880be (22:40be) text "!" prompt -_AIBattleUseItemText:: ; 880d5 (22:40d5) +_AIBattleUseItemText:: TX_RAM wTrainerName db $0 line "used @" @@ -261,7 +254,7 @@ _AIBattleUseItemText:: ; 880d5 (22:40d5) text "!" prompt -_TradeWentToText:: ; 880ef (22:40ef) +_TradeWentToText:: TX_RAM wcf4b text " went" line "to @" @@ -269,14 +262,14 @@ _TradeWentToText:: ; 880ef (22:40ef) text "." done -_TradeForText:: ; 88103 (22:4103) +_TradeForText:: text "For ", $52, "'s" line "@" TX_RAM wcf4b text "," done -_TradeSendsText:: ; 88112 (22:4112) +_TradeSendsText:: TX_RAM wGrassRate text " sends" line "@" @@ -284,26 +277,26 @@ _TradeSendsText:: ; 88112 (22:4112) text "." done -_TradeWavesFarewellText:: ; 88124 (22:4124) +_TradeWavesFarewellText:: TX_RAM wGrassRate text " waves" line "farewell as" done -_TradeTransferredText:: ; 8813b (22:413b) +_TradeTransferredText:: TX_RAM wcd6d text " is" line "transferred." done -_TradeTakeCareText:: ; 88150 (22:4150) +_TradeTakeCareText:: text "Take good care of" line "@" TX_RAM wcd6d text "." done -_TradeWillTradeText:: ; 8816a (22:416a) +_TradeWillTradeText:: TX_RAM wGrassRate text " will" line "trade @" @@ -311,57 +304,57 @@ _TradeWillTradeText:: ; 8816a (22:416a) db $0 done -_TradeforText:: ; 88180 (22:4180) +_TradeforText:: text "for ", $52, "'s" line "@" TX_RAM wcf4b text "." done -_PlaySlotMachineText:: ; 8818f (22:418f) +_PlaySlotMachineText:: text "A slot machine!" line "Want to play?" done -_OutOfCoinsSlotMachineText:: ; 881ae (22:41ae) +_OutOfCoinsSlotMachineText:: text "Darn!" line "Ran out of coins!" done -_BetHowManySlotMachineText:: ; 881c7 (22:41c7) +_BetHowManySlotMachineText:: text "Bet how many" line "coins?" done -_StartSlotMachineText:: ; 881dc (22:41dc) +_StartSlotMachineText:: text "Start!" done -_NotEnoughCoinsSlotMachineText:: ; 881e4 (22:41e4) +_NotEnoughCoinsSlotMachineText:: text "Not enough" line "coins!" prompt -_OneMoreGoSlotMachineText:: ; 881f7 (22:41f7) +_OneMoreGoSlotMachineText:: text "One more " line "go?" done -_LinedUpText:: ; 88206 (22:4206) +_LinedUpText:: text " lined up!" line "Scored @" TX_RAM wcf4b text " coins!" done -_NotThisTimeText:: ; 88226 (22:4226) +_NotThisTimeText:: text "Not this time!" prompt -_YeahText:: ; 88236 (22:4236) +_YeahText:: text "Yeah!@@" -_DexSeenOwnedText:: ; 8823e (22:423e) +_DexSeenOwnedText:: text "#DEX Seen:@" TX_NUM wDexRatingNumMonsSeen, 1, 3 db $0 @@ -369,11 +362,11 @@ _DexSeenOwnedText:: ; 8823e (22:423e) TX_NUM wDexRatingNumMonsOwned, 1, 3 db "@" -_DexRatingText:: ; 88267 (22:4267) +_DexRatingText:: text "#DEX Rating", $6d done -_GymStatueText1:: ; 88275 (22:4275) +_GymStatueText1:: TX_RAM wGymCityName db $0 line "#MON GYM" @@ -385,7 +378,7 @@ _GymStatueText1:: ; 88275 (22:4275) line $53 done -_GymStatueText2:: ; 882a5 (22:42a5) +_GymStatueText2:: TX_RAM wGymCityName db $0 line "#MON GYM" @@ -398,14 +391,14 @@ _GymStatueText2:: ; 882a5 (22:42a5) cont $52 done -_ViridianCityPokecenterGuyText:: ; 882d7 (22:42d7) +_ViridianCityPokecenterGuyText:: text "#MON CENTERs" line "heal your tired," cont "hurt or fainted" cont "#MON!" done -_PewterCityPokecenterGuyText:: ; 8830c (22:430c) +_PewterCityPokecenterGuyText:: text "Yawn!" para "When JIGGLYPUFF" @@ -416,7 +409,7 @@ _PewterCityPokecenterGuyText:: ; 8830c (22:430c) line "Snore..." done -_CeruleanPokecenterGuyText:: ; 88353 (22:4353) +_CeruleanPokecenterGuyText:: text "BILL has lots of" line "#MON!" @@ -424,7 +417,7 @@ _CeruleanPokecenterGuyText:: ; 88353 (22:4353) line "ones too!" done -_LavenderPokecenterGuyText:: ; 88386 (22:4386) +_LavenderPokecenterGuyText:: text "CUBONEs wear" line "skulls, right?" @@ -432,36 +425,36 @@ _LavenderPokecenterGuyText:: ; 88386 (22:4386) line "lot for one!" done -_MtMoonPokecenterBenchGuyText:: ; 883c2 (22:43c2) +_MtMoonPokecenterBenchGuyText:: text "If you have too" line "many #MON, you" cont "should store them" cont "via PC!" done -_RockTunnelPokecenterGuyText:: ; 883fc (22:43fc) +_RockTunnelPokecenterGuyText:: text "I heard that" line "GHOSTs haunt" cont "LAVENDER TOWN!" done -_UnusedBenchGuyText1:: ; 88426 (22:4426) +_UnusedBenchGuyText1:: text "I wish I could" line "catch #MON." done -_UnusedBenchGuyText2:: ; 88442 (22:4442) +_UnusedBenchGuyText2:: text "I'm tired from" line "all the fun..." done -_UnusedBenchGuyText3:: ; 88460 (22:4460) +_UnusedBenchGuyText3:: text "SILPH's manager" line "is hiding in the" cont "SAFARI ZONE." done -_VermilionPokecenterGuyText:: ; 8848e (22:448e) +_VermilionPokecenterGuyText:: text "It is true that a" line "higher level" cont "#MON will be" @@ -477,13 +470,13 @@ _VermilionPokecenterGuyText:: ; 8848e (22:448e) cont "strong #MON." done -_CeladonCityPokecenterGuyText:: ; 88531 (22:4531) +_CeladonCityPokecenterGuyText:: text "If I had a BIKE," line "I would go to" cont "CYCLING ROAD!" done -_FuchsiaCityPokecenterGuyText:: ; 8855f (22:455f) +_FuchsiaCityPokecenterGuyText:: text "If you're studying " line "#MON, visit" cont "the SAFARI ZONE." @@ -492,7 +485,7 @@ _FuchsiaCityPokecenterGuyText:: ; 8855f (22:455f) line "of rare #MON." done -_CinnabarPokecenterGuyText:: ; 885af (22:45af) +_CinnabarPokecenterGuyText:: text "#MON can still" line "learn techniques" cont "after canceling" @@ -503,65 +496,65 @@ _CinnabarPokecenterGuyText:: ; 885af (22:45af) cont "have been learned." done -_SaffronCityPokecenterGuyText1:: ; 88621 (22:4621) +_SaffronCityPokecenterGuyText1:: text "It would be great" line "if the ELITE FOUR" cont "came and stomped" cont "TEAM ROCKET!" done -_SaffronCityPokecenterGuyText2:: ; 88664 (22:4664) +_SaffronCityPokecenterGuyText2:: text "TEAM ROCKET took" line "off! We can go" cont "out safely again!" cont "That's great!" done -_CeladonCityHotelText:: ; 886a4 (22:46a4) +_CeladonCityHotelText:: text "My sis brought me" line "on this vacation!" done -_BookcaseText:: ; 886c9 (22:46c9) +_BookcaseText:: text "Crammed full of" line "#MON books!" done -_NewBicycleText:: ; 886e6 (22:46e6) +_NewBicycleText:: text "A shiny new" line "BICYCLE!" done -_PushStartText:: ; 886fc (22:46fc) +_PushStartText:: text "Push START to" line "open the MENU!" done -_SaveOptionText:: ; 8871a (22:471a) +_SaveOptionText:: text "The SAVE option is" line "on the MENU" cont "screen." done -_StrengthsAndWeaknessesText:: ; 88742 (22:4742) +_StrengthsAndWeaknessesText:: text "All #MON types" line "have strong and" cont "weak points" cont "against others." done -_TimesUpText:: ; 8877e (22:477e) +_TimesUpText:: text "PA: Ding-dong!" para "Time's up!" prompt -_GameOverText:: ; 88798 (22:4798) +_GameOverText:: text "PA: Your SAFARI" line "GAME is over!" done -_CinnabarGymQuizIntroText:: ; 887b7 (22:47b7) +_CinnabarGymQuizIntroText:: text "#MON Quiz!" para "Get it right and" @@ -580,58 +573,52 @@ _CinnabarGymQuizIntroText:: ; 887b7 (22:47b7) line "Here we go!" prompt -IF DEF(_YELLOW) - text "#MON Quiz!" - line "Test your skill!" - done -ENDC - -_CinnabarQuizQuestionsText1:: ; 8886d (22:486d) +_CinnabarQuizQuestionsText1:: text "CATERPIE evolves" line "into BUTTERFREE?" done -_CinnabarQuizQuestionsText2:: ; 88890 (22:4890) +_CinnabarQuizQuestionsText2:: text "There are 9" line "certified #MON" cont "LEAGUE BADGEs?" done -_CinnabarQuizQuestionsText3:: ; 888bb (22:48bb) +_CinnabarQuizQuestionsText3:: text "POLIWAG evolves 3" line "times?" done -_CinnabarQuizQuestionsText4:: ; 888d5 (22:48d5) +_CinnabarQuizQuestionsText4:: text "Are thunder moves" line "effective against" cont "ground element-" cont "type #MON?" done -_CinnabarQuizQuestionsText5:: ; 88915 (22:4915) +_CinnabarQuizQuestionsText5:: text "#MON of the" line "same kind and" cont "level are not" cont "identical?" done -_CinnabarQuizQuestionsText6:: ; 88949 (22:4949) +_CinnabarQuizQuestionsText6:: text "TM28 contains" line "TOMBSTONER?" done -_CinnabarGymQuizCorrectText:: ; 88964 (22:4964) +_CinnabarGymQuizCorrectText:: text "You're absolutely" line "correct!" para "Go on through!@@" -_CinnabarGymQuizIncorrectText:: ; 8898f (22:498f) +_CinnabarGymQuizIncorrectText:: text "Sorry! Bad call!" prompt -_MagazinesText:: ; 889a1 (22:49a1) +_MagazinesText:: text "#MON magazines!" para "#MON notebooks!" @@ -639,28 +626,28 @@ _MagazinesText:: ; 889a1 (22:49a1) para "#MON graphs!" done -_BillsHouseMonitorText:: ; 889cf (22:49cf) +_BillsHouseMonitorText:: text "TELEPORTER is" line "displayed on the" cont "PC monitor." done -_BillsHouseInitiatedText:: ; 889fb (22:49fb) +_BillsHouseInitiatedText:: text $52, " initiated" line "TELEPORTER's Cell" cont "Separator!@@" -_BillsHousePokemonListText1:: ; 88a25 (22:4a25) +_BillsHousePokemonListText1:: text "BILL's favorite" line "#MON list!" prompt -_BillsHousePokemonListText2:: ; 88a40 (22:4a40) +_BillsHousePokemonListText2:: text "Which #MON do" line "you want to see?" done -_OakLabEmailText:: ; 88a60 (22:4a60) +_OakLabEmailText:: text "There's an e-mail" line "message here!" @@ -687,36 +674,36 @@ _OakLabEmailText:: ; 88a60 (22:4a60) cont "..." done -_GameCornerCoinCaseText:: ; 88b5b (22:4b5b) +_GameCornerCoinCaseText:: text "A COIN CASE is" line "required!" done -_GameCornerNoCoinsText:: ; 88b75 (22:4b75) +_GameCornerNoCoinsText:: text "You don't have" line "any coins!" done -_GameCornerOutOfOrderText:: ; 88b8f (22:4b8f) +_GameCornerOutOfOrderText:: text "OUT OF ORDER" line "This is broken." done -_GameCornerOutToLunchText:: ; 88bad (22:4bad) +_GameCornerOutToLunchText:: text "OUT TO LUNCH" line "This is reserved." done -_GameCornerSomeonesKeysText:: ; 88bcd (22:4bcd) +_GameCornerSomeonesKeysText:: text "Someone's keys!" line "They'll be back." done -_JustAMomentText:: ; 88bed (22:4bed) +_JustAMomentText:: text "Just a moment." done -TMNotebookText:: ; 88bfd (22:4bfd) +TMNotebookText:: text "It's a pamphlet" line "on TMs." @@ -731,15 +718,15 @@ TMNotebookText:: ; 88bfd (22:4bfd) para "SILPH CO.@@" -_TurnPageText:: ; 88c6f (22:4c6f) +_TurnPageText:: text "Turn the page?" done -_ViridianSchoolNotebookText5:: ; 88c7f (22:4c7f) +_ViridianSchoolNotebookText5:: text "GIRL: Hey! Don't" line "look at my notes!@@" -_ViridianSchoolNotebookText1:: ; 88ca3 (22:4ca3) +_ViridianSchoolNotebookText1:: text "Looked at the" line "notebook!" @@ -758,7 +745,7 @@ _ViridianSchoolNotebookText1:: ; 88ca3 (22:4ca3) cont "#MON trainers." prompt -_ViridianSchoolNotebookText2:: ; 88d46 (22:4d46) +_ViridianSchoolNotebookText2:: text "Second page..." para "A healthy #MON" @@ -771,7 +758,7 @@ _ViridianSchoolNotebookText2:: ; 88d46 (22:4d46) cont "effective!" prompt -_ViridianSchoolNotebookText3:: ; 88dbd (22:4dbd) +_ViridianSchoolNotebookText3:: text "Third page..." para "#MON trainers" @@ -784,7 +771,7 @@ _ViridianSchoolNotebookText3:: ; 88dbd (22:4dbd) cont "at #MON GYMs." prompt -_ViridianSchoolNotebookText4:: ; 88e2c (22:4e2c) +_ViridianSchoolNotebookText4:: text "Fourth page..." para "The goal for" @@ -800,33 +787,33 @@ _ViridianSchoolNotebookText4:: ; 88e2c (22:4e2c) line "#MON LEAGUE!" prompt -_FightingDojoText_52a10:: ; 88ec1 (22:4ec1) +_FightingDojoText_52a10:: text "Enemies on every" line "side!" done -_FightingDojoText_52a1d:: ; 88ed9 (22:4ed9) +_FightingDojoText_52a1d:: text "What goes around" line "comes around!" done -_FightingDojoText:: ; 88ef9 (22:4ef9) +_FightingDojoText:: text "FIGHTING DOJO" done -_IndigoPlateauHQText:: ; 88f08 (22:4f08) +_IndigoPlateauHQText:: text "INDIGO PLATEAU" line "#MON LEAGUE HQ" done -_RedBedroomSNESText:: ; 88f27 (22:4f27) +_RedBedroomSNESText:: text $52, " is" line "playing the SNES!" cont "...Okay!" cont "It's time to go!" done -_Route15UpstairsBinocularsText:: ; 88f58 (22:4f58) +_Route15UpstairsBinocularsText:: text "Looked into the" line "binoculars..." @@ -835,41 +822,31 @@ _Route15UpstairsBinocularsText:: ; 88f58 (22:4f58) cont "toward the sea." done -_AerodactylFossilText:: ; 88fa7 (22:4fa7) +_AerodactylFossilText:: text "AERODACTYL Fossil" line "A primitive and" cont "rare #MON." done -_KabutopsFossilText:: ; 88fd5 (22:4fd5) +_KabutopsFossilText:: text "KABUTOPS Fossil" line "A primitive and" cont "rare #MON." done -IF DEF(_YELLOW) -_FanClubPicture1Text:: - text "My cute RAPIDASH." - done - -_FanClubPicture2Text:: - text "My beloved FEAROW." - done -ENDC - -_LinkCableHelpText1:: ; 89001 (22:5001) +_LinkCableHelpText1:: text "TRAINER TIPS" para "Using a Game Link" line "Cable" prompt -_LinkCableHelpText2:: ; 89027 (22:5027) +_LinkCableHelpText2:: text "Which heading do" line "you want to read?" done -_LinkCableInfoText1:: ; 8904b (22:504b) +_LinkCableInfoText1:: text "When you have" line "linked your GAME" cont "BOY with another" @@ -879,31 +856,31 @@ _LinkCableInfoText1:: ; 8904b (22:504b) cont "#MON CENTER." prompt -_LinkCableInfoText2:: ; 890bd (22:50bd) +_LinkCableInfoText2:: text "COLOSSEUM lets" line "you play against" cont "a friend." prompt -_LinkCableInfoText3:: ; 890e8 (22:50e8) +_LinkCableInfoText3:: text "TRADE CENTER is" line "used for trading" cont "#MON." prompt -_ViridianSchoolBlackboardText1:: ; 89110 (22:5110) +_ViridianSchoolBlackboardText1:: text "The blackboard" line "describes #MON" cont "STATUS changes" cont "during battles." prompt -_ViridianSchoolBlackboardText2:: ; 8914e (22:514e) +_ViridianSchoolBlackboardText2:: text "Which heading do" line "you want to read?" done -_ViridianBlackboardSleepText:: ; 89172 (22:5172) +_ViridianBlackboardSleepText:: text "A #MON can't" line "attack if it's" cont "asleep!" @@ -916,7 +893,7 @@ _ViridianBlackboardSleepText:: ; 89172 (22:5172) line "wake them up!" prompt -_ViridianBlackboardPoisonText:: ; 891de (22:51de) +_ViridianBlackboardPoisonText:: text "When poisoned, a" line "#MON's health" cont "steadily drops." @@ -928,7 +905,7 @@ _ViridianBlackboardPoisonText:: ; 891de (22:51de) line "to cure poison!" prompt -_ViridianBlackbaordPrlzText:: ; 8924b (22:524b) +_ViridianBlackbaordPrlzText:: text "Paralysis could" line "make #MON" cont "moves misfire!" @@ -940,7 +917,7 @@ _ViridianBlackbaordPrlzText:: ; 8924b (22:524b) line "for treatment!" prompt -_ViridianBlackboardBurnText:: ; 892b5 (22:52b5) +_ViridianBlackboardBurnText:: text "A burn reduces" line "power and speed." cont "It also causes" @@ -953,7 +930,7 @@ _ViridianBlackboardBurnText:: ; 892b5 (22:52b5) line "cure a burn!" prompt -_ViridianBlackboardFrozenText:: ; 8932f (22:532f) +_ViridianBlackboardFrozenText:: text "If frozen, a" line "#MON becomes" cont "totally immobile!" @@ -966,12 +943,12 @@ _ViridianBlackboardFrozenText:: ; 8932f (22:532f) line "thaw out #MON!" prompt -_VermilionGymTrashText:: ; 893a7 (22:53a7) +_VermilionGymTrashText:: text "Nope, there's" line "only trash here." done -_VermilionGymTrashSuccesText1:: ; 893c6 (22:53c6) +_VermilionGymTrashSuccesText1:: text "Hey! There's a" line "switch under the" cont "trash!" @@ -980,168 +957,168 @@ _VermilionGymTrashSuccesText1:: ; 893c6 (22:53c6) para "The 1st electric" line "lock opened!@@" -_VermilionGymTrashSuccesText2:: ; 89418 (22:5418) +_VermilionGymTrashSuccesText2:: text "Hey! There's" line "another switch" cont "under the trash!" cont "Turn it on!" prompt -_VermilionGymTrashSuccesText3:: ; 89451 (22:5451) +_VermilionGymTrashSuccesText3:: text "The 2nd electric" line "lock opened!" para "The motorized door" line "opened!@@" -_VermilionGymTrashFailText:: ; 8948c (22:548c) +_VermilionGymTrashFailText:: text "Nope! There's" line "only trash here." cont "Hey! The electric" cont "locks were reset!@@" -_FoundHiddenItemText:: ; 894d0 (22:54d0) +_FoundHiddenItemText:: text $52, " found" line "@" TX_RAM wcd6d text "!@@" -_HiddenItemBagFullText:: ; 894e1 (22:54e1) +_HiddenItemBagFullText:: text "But, ", $52, " has" line "no more room for" cont "other items!" done -_FoundHiddenCoinsText:: ; 8950b (22:550b) +_FoundHiddenCoinsText:: text $52, " found" line "@" TX_BCD hCoins, $c2 text " coins!@@" -_FoundHiddenCoins2Text:: ; 89523 (22:5523) +_FoundHiddenCoins2Text:: text $52, " found" line "@" TX_BCD hCoins, $c2 text " coins!@@" -_DroppedHiddenCoinsText:: ; 8953b (22:553b) +_DroppedHiddenCoinsText:: db $0 para "Oops! Dropped" line "some coins!" done -_IndigoPlateauStatuesText1:: ; 89557 (22:5557) +_IndigoPlateauStatuesText1:: text "INDIGO PLATEAU" prompt -_IndigoPlateauStatuesText2:: ; 89567 (22:5567) +_IndigoPlateauStatuesText2:: text "The ultimate goal" line "of trainers!" cont "#MON LEAGUE HQ" done -_IndigoPlateauStatuesText3:: ; 89596 (22:5596) +_IndigoPlateauStatuesText3:: text "The highest" line "#MON authority" cont "#MON LEAGUE HQ" done -_PokemonBooksText:: ; 895c1 (22:55c1) +_PokemonBooksText:: text "Crammed full of" line "#MON books!" done -_DiglettSculptureText:: ; 895de (22:55de) +_DiglettSculptureText:: text "It's a sculpture" line "of DIGLETT." done -_ElevatorText:: ; 895fb (22:55fb) +_ElevatorText:: text "This is an" line "elevator." done -_TownMapText:: ; 89611 (22:5611) +_TownMapText:: text "A TOWN MAP.@@" -_PokemonStuffText:: ; 8961f (22:561f) +_PokemonStuffText:: text "Wow! Tons of" line "#MON stuff!" done -_OutOfSafariBallsText:: ; 89639 (22:5639) +_OutOfSafariBallsText:: text "PA: Ding-dong!" para "You are out of" line "SAFARI BALLs!" prompt -_WildRanText:: ; 89666 (22:5666) +_WildRanText:: text "Wild @" TX_RAM wEnemyMonNick db $0 line "ran!" prompt -_EnemyRanText:: ; 89677 (22:5677) +_EnemyRanText:: text "Enemy @" TX_RAM wEnemyMonNick db $0 line "ran!" prompt -_HurtByPoisonText:: ; 89689 (22:5689) +_HurtByPoisonText:: text $5a, "'s" line "hurt by poison!" prompt -_HurtByBurnText:: ; 8969d (22:569d) +_HurtByBurnText:: text $5a, "'s" line "hurt by the burn!" prompt -_HurtByLeechSeedText:: ; 896b3 (22:56b3) +_HurtByLeechSeedText:: text "LEECH SEED saps" line $5a, "!" prompt -_EnemyMonFaintedText:: ; 0x896c7 +_EnemyMonFaintedText:: text "Enemy @" TX_RAM wEnemyMonNick db $0 line "fainted!" prompt -_MoneyForWinningText:: ; 896dd (22:56dd) +_MoneyForWinningText:: text $52, " got ¥@" TX_BCD wAmountMoneyWon, $c3 db $0 line "for winning!" prompt -_TrainerDefeatedText:: ; 896f9 (22:56f9) +_TrainerDefeatedText:: text $52, " defeated" line "@" TX_RAM wTrainerName text "!" prompt -_PlayerMonFaintedText:: ; 8970c (22:570c) +_PlayerMonFaintedText:: TX_RAM wBattleMonNick db $0 line "fainted!" prompt -_UseNextMonText:: ; 8971a (22:571a) +_UseNextMonText:: text "Use next #MON?" done -_Sony1WinText:: ; 8972a (22:572a) +_Sony1WinText:: text $53, ": Yeah! Am" line "I great or what?" prompt -_PlayerBlackedOutText2:: ; 89748 (22:5748) +_PlayerBlackedOutText2:: text $52, " is out of" line "useable #MON!" @@ -1149,14 +1126,14 @@ _PlayerBlackedOutText2:: ; 89748 (22:5748) line "out!" prompt -_LinkBattleLostText:: ; 89772 (22:5772) +_LinkBattleLostText:: text $52, " lost to" line "@" TX_RAM wTrainerName text "!" prompt -_TrainerAboutToUseText:: ; 89784 (22:5784) +_TrainerAboutToUseText:: TX_RAM wTrainerName text " is" line "about to use" @@ -1168,7 +1145,7 @@ _TrainerAboutToUseText:: ; 89784 (22:5784) line "change #MON?" done -_TrainerSentOutText:: ; 897b4 (22:57b4) +_TrainerSentOutText:: TX_RAM wTrainerName text " sent" line "out @" @@ -1176,152 +1153,146 @@ _TrainerSentOutText:: ; 897b4 (22:57b4) text "!" done -_NoWillText:: ; 897c9 (22:57c9) +_NoWillText:: text "There's no will" line "to fight!" prompt -_CantEscapeText:: ; 897e3 (22:57e3) +_CantEscapeText:: text "Can't escape!" prompt -_NoRunningText:: ; 897f1 (22:57f1) +_NoRunningText:: text "No! There's no" line "running from a" cont "trainer battle!" prompt -_GotAwayText:: ; 8981f (22:581f) +_GotAwayText:: text "Got away safely!" prompt -IF DEF(_YELLOW) -_RunAwayText:: - text "Hurry, get away!" - prompt -ENDC - -_ItemsCantBeUsedHereText:: ; 89831 (22:5831) +_ItemsCantBeUsedHereText:: text "Items can't be" line "used here." prompt -_AlreadyOutText:: ; 8984b (22:584b) +_AlreadyOutText:: TX_RAM wBattleMonNick text " is" line "already out!" prompt -_MoveNoPPText:: ; 89860 (22:5860) +_MoveNoPPText:: text "No PP left for" line "this move!" prompt -_MoveDisabledText:: ; 8987b (22:587b) +_MoveDisabledText:: text "The move is" line "disabled!" prompt -_NoMovesLeftText:: ; 89892 (22:5892) +_NoMovesLeftText:: TX_RAM wBattleMonNick text " has no" line "moves left!" done -_MultiHitText:: ; 898aa (22:58aa) +_MultiHitText:: text "Hit the enemy" line "@" TX_NUM wPlayerNumHits,1,1 text " times!" prompt -_ScaredText:: ; 898c7 (22:58c7) +_ScaredText:: TX_RAM wBattleMonNick text " is too" line "scared to move!" prompt -_GetOutText:: ; 898e3 (22:58e3) +_GetOutText:: text "GHOST: Get out..." line "Get out..." prompt -_FastAsleepText:: ; 89901 (22:5901) +_FastAsleepText:: text $5A line "is fast asleep!" prompt -_WokeUpText:: ; 89914 (22:5914) +_WokeUpText:: text $5A line "woke up!" prompt -_IsFrozenText:: ; 89920 (22:5920) +_IsFrozenText:: text $5A line "is frozen solid!" prompt -_FullyParalyzedText:: ; 89934 (22:5934) +_FullyParalyzedText:: text $5A,"'s" line "fully paralyzed!" prompt -_FlinchedText:: ; 89949 (22:5949) +_FlinchedText:: text $5A line "flinched!" prompt -_MustRechargeText:: ; 89956 (22:5956) +_MustRechargeText:: text $5A line "must recharge!" prompt -_DisabledNoMoreText:: ; 89968 (22:5968) +_DisabledNoMoreText:: text $5A,"'s" line "disabled no more!" prompt -_IsConfusedText:: ; 8997e (22:597e) +_IsConfusedText:: text $5A line "is confused!" prompt -_HurtItselfText:: ; 8998e (22:598e) +_HurtItselfText:: text "It hurt itself in" line "its confusion!" prompt -_ConfusedNoMoreText:: ; 899b0 (22:59b0) +_ConfusedNoMoreText:: text $5A,"'s" line "confused no more!" prompt -_SavingEnergyText:: ; 899c6 (22:59c6) +_SavingEnergyText:: text $5A line "is saving energy!" prompt -_UnleashedEnergyText:: ; 899db (22:59db) +_UnleashedEnergyText:: text $5A line "unleashed energy!" prompt -_ThrashingAboutText:: ; 899f0 (22:59f0) +_ThrashingAboutText:: text $5A,"'s" line "thrashing about!" done -_AttackContinuesText:: ; 89a05 (22:5a05) +_AttackContinuesText:: text $5A,"'s" line "attack continues!" done -_CantMoveText:: ; 89a1b (22:5a1b) +_CantMoveText:: text $5A line "can't move!" prompt -_MoveIsDisabledText:: ; 89a29 (22:5a29) +_MoveIsDisabledText:: text $5a, "'s" line "@" TX_RAM wcd6d @@ -1329,163 +1300,163 @@ _MoveIsDisabledText:: ; 89a29 (22:5a29) cont "disabled!" prompt -_MonName1Text:: ; 89a40 (22:5a40) +_MonName1Text:: text $5a, "@@" -_Used1Text:: ; 89a44 (22:5a44) +_Used1Text:: db $0 line "used @@" -_Used2Text:: ; 89a4d (22:5a4d) +_Used2Text:: db $0 line "used @@" -_InsteadText:: ; 89a56 (22:5a56) +_InsteadText:: text "instead," cont "@@" -_CF4BText:: ; 89a62 (22:5a62) +_CF4BText:: TX_RAM wcf4b text "@" -_ExclamationPoint1Text:: ; 89a67 (22:5a67) +_ExclamationPoint1Text:: text "!" done -_ExclamationPoint2Text:: ; 89a6a (22:5a6a) +_ExclamationPoint2Text:: text "!" done -_ExclamationPoint3Text:: ; 89a6d (22:5a6d) +_ExclamationPoint3Text:: text "!" done -_ExclamationPoint4Text:: ; 89a70 (22:5a70) +_ExclamationPoint4Text:: text "!" done -_ExclamationPoint5Text:: ; 89a73 (22:5a73) +_ExclamationPoint5Text:: text "!" done -_AttackMissedText:: ; 89a76 (22:5a76) +_AttackMissedText:: text $5a, "'s" line "attack missed!" prompt -_KeptGoingAndCrashedText:: ; 89a89 (22:5a89) +_KeptGoingAndCrashedText:: text $5a line "kept going and" cont "crashed!" prompt -_UnaffectedText:: ; 89aa4 (22:5aa4) +_UnaffectedText:: text $59, "'s" line "unaffected!" prompt -_DoesntAffectMonText:: ; 89ab4 (22:5ab4) +_DoesntAffectMonText:: text "It doesn't affect" line $59, "!" prompt -_CriticalHitText:: ; 89ac9 (22:5ac9) +_CriticalHitText:: text "Critical hit!" prompt -_OHKOText:: ; 89ad8 (22:5ad8) +_OHKOText:: text "One-hit KO!" prompt -_LoafingAroundText:: ; 89ae5 (22:5ae5) +_LoafingAroundText:: TX_RAM wBattleMonNick text " is" line "loafing around." prompt -_BeganToNapText:: ; 89afd (22:5afd) +_BeganToNapText:: TX_RAM wBattleMonNick text " began" line "to nap!" prompt -_WontObeyText:: ; 89b10 (22:5b10) +_WontObeyText:: TX_RAM wBattleMonNick text " won't" line "obey!" prompt -_TurnedAwayText:: ; 89b20 (22:5b20) +_TurnedAwayText:: TX_RAM wBattleMonNick text " turned" line "away!" prompt -_IgnoredOrdersText:: ; 89b32 (22:5b32) +_IgnoredOrdersText:: TX_RAM wBattleMonNick db $0 line "ignored orders!" prompt -_SubstituteTookDamageText:: ; 89b47 (22:5b47) +_SubstituteTookDamageText:: text "The SUBSTITUTE" line "took damage for" cont $59, "!" prompt -_SubstituteBrokeText:: ; 89b6a (22:5b6a) +_SubstituteBrokeText:: text $59, "'s" line "SUBSTITUTE broke!" prompt -_BuildingRageText:: ; 89b80 (22:5b80) +_BuildingRageText:: text $5a, "'s" line "RAGE is building!" prompt -_MirrorMoveFailedText:: ; 89b96 (22:5b96) +_MirrorMoveFailedText:: text "The MIRROR MOVE" next "failed!" prompt -_HitXTimesText:: ; 89baf (22:5baf) +_HitXTimesText:: text "Hit @" TX_NUM wEnemyNumHits, 1, 1 text " times!" prompt -_GainedText:: ; 89bc2 (22:5bc2) +_GainedText:: TX_RAM wcd6d text " gained" line "@@" -_WithExpAllText:: ; 89bd0 (22:5bd0) +_WithExpAllText:: text "with EXP.ALL," cont "@@" -_BoostedText:: ; 89be1 (22:5be1) +_BoostedText:: text "a boosted" cont "@@" -_ExpPointsText:: ; 89bee (22:5bee) +_ExpPointsText:: TX_NUM wExpAmountGained, 2, 4 text " EXP. Points!" prompt -_GrewLevelText:: ; 89c01 (22:5c01) +_GrewLevelText:: TX_RAM wcd6d text " grew" line "to level @" TX_NUM wCurEnemyLVL, 1, 3 text "!@@" -_WildMonAppearedText:: ; 89c1d (22:5c1d) +_WildMonAppearedText:: text "Wild @" TX_RAM wEnemyMonNick db $0 line "appeared!" prompt -_HookedMonAttackedText:: ; 89c33 (22:5c33) +_HookedMonAttackedText:: text "The hooked" line "@" TX_RAM wEnemyMonNick @@ -1493,83 +1464,83 @@ _HookedMonAttackedText:: ; 89c33 (22:5c33) cont "attacked!" prompt -_EnemyAppearedText:: ; 89c4f (22:5c4f) +_EnemyAppearedText:: TX_RAM wEnemyMonNick db $0 line "appeared!" prompt -_TrainerWantsToFightText:: ; 89c5e (22:5c5e) +_TrainerWantsToFightText:: TX_RAM wTrainerName text " wants" line "to fight!" prompt -_UnveiledGhostText:: ; 89c73 (22:5c73) +_UnveiledGhostText:: text "SILPH SCOPE" line "unveiled the" cont "GHOST's identity!" prompt -_GhostCantBeIDdText:: ; 89c9e (22:5c9e) +_GhostCantBeIDdText:: text "Darn! The GHOST" line "can't be ID'd!" prompt -_GoText:: ; 89cbc (22:5cbc) +_GoText:: text "Go! @@" -_DoItText:: ; 89cc3 (22:5cc3) +_DoItText:: text "Do it! @@" -_GetmText:: ; 89ccd (22:5ccd) +_GetmText:: text "Get'm! @@" -_EnemysWeakText:: ; 89cd6 (22:5cd6) +_EnemysWeakText:: text "The enemy's weak!" line "Get'm! @@" -_PlayerMon1Text:: ; 89cf0 (22:5cf0) +_PlayerMon1Text:: TX_RAM wBattleMonNick text "!" done -_PlayerMon2Text:: ; 89cf6 (22:5cf6) +_PlayerMon2Text:: TX_RAM wBattleMonNick text " @@" -_EnoughText:: ; 89cfd (22:5cfd) +_EnoughText:: text "enough!@@" -_OKExclamationText:: ; 89d07 (22:5d07) +_OKExclamationText:: text "OK!@@" -_GoodText:: ; 89d0d (22:5d0d) +_GoodText:: text "good!@@" -_ComeBackText:: ; 89d15 (22:5d15) +_ComeBackText:: db $0 line "Come back!" done -_SuperEffectiveText:: ; 89d22 (22:5d22) +_SuperEffectiveText:: text "It's super" line "effective!" prompt -_NotVeryEffectiveText:: ; 89d38 (22:5d38) +_NotVeryEffectiveText:: text "It's not very" line "effective..." prompt -_SafariZoneEatingText:: ; 89d53 (22:5d53) +_SafariZoneEatingText:: text "Wild @" TX_RAM wEnemyMonNick db $0 line "is eating!" prompt -_SafariZoneAngryText:: ; 89d6a (22:5d6a) +_SafariZoneAngryText:: text "Wild @" TX_RAM wEnemyMonNick db $0 @@ -1577,59 +1548,48 @@ _SafariZoneAngryText:: ; 89d6a (22:5d6a) prompt ; money related -_PickUpPayDayMoneyText:: ; 89d80 (22:5d80) +_PickUpPayDayMoneyText:: text $52, " picked up" line "¥@" TX_BCD wTotalPayDayMoney, $c3 text "!" prompt -_ClearSaveDataText:: ; 89d96 (22:5d96) +_ClearSaveDataText:: text "Clear all saved" line "data?" done -_WhichFloorText:: ; 89dad (22:5dad) +_WhichFloorText:: text "Which floor do" line "you want? " done -IF DEF(_YELLOW) -_SleepingPikachuText1:: - text "There isn't any" - line "response..." - prompt -ENDC - -_PartyMenuNormalText:: ; 89dc8 (22:5dc8) +_PartyMenuNormalText:: text "Choose a #MON." done -_PartyMenuItemUseText:: ; 89dd8 (22:5dd8) +_PartyMenuItemUseText:: text "Use item on which" line "#MON?" done -_PartyMenuBattleText:: ; 89df1 (22:5df1) +_PartyMenuBattleText:: text "Bring out which" line "#MON?" done -_PartyMenuUseTMText:: ; 89e08 (22:5e08) -IF DEF(_YELLOW) - text "Teach to which" -ELSE +_PartyMenuUseTMText:: text "Use TM on which" -ENDC line "#MON?" done -_PartyMenuSwapMonText:: ; 89e1f (22:5e1f) +_PartyMenuSwapMonText:: text "Move #MON" line "where?" done -_PotionText:: ; 89e31 (22:5e31) +_PotionText:: TX_RAM wcd6d db $0 line "recovered by @" @@ -1637,61 +1597,61 @@ _PotionText:: ; 89e31 (22:5e31) text "!" done -_AntidoteText:: ; 89e4b (22:5e4b) +_AntidoteText:: TX_RAM wcd6d text " was" line "cured of poison!" done -_ParlyzHealText:: ; 89e65 (22:5e65) +_ParlyzHealText:: TX_RAM wcd6d text "'s" line "rid of paralysis!" done -_BurnHealText:: ; 89e7d (22:5e7d) +_BurnHealText:: TX_RAM wcd6d text "'s" line "burn was healed!" done -_IceHealText:: ; 89e94 (22:5e94) +_IceHealText:: TX_RAM wcd6d text " was" line "defrosted!" done -_AwakeningText:: ; 89ea8 (22:5ea8) +_AwakeningText:: TX_RAM wcd6d db $0 line "woke up!" done -_FullHealText:: ; 89eb6 (22:5eb6) +_FullHealText:: TX_RAM wcd6d text "'s" line "health returned!" done -_ReviveText:: ; 89ecd (22:5ecd) +_ReviveText:: TX_RAM wcd6d db $0 line "is revitalized!" done -_RareCandyText:: ; 89ee2 (22:5ee2) +_RareCandyText:: TX_RAM wcd6d text " grew" line "to level @" TX_NUM wCurEnemyLVL, $1,$3 text "!@@" -_TurnedOnPC1Text:: ; 89efe (22:5efe) +_TurnedOnPC1Text:: text $52, " turned on" line "the PC." prompt -_AccessedBillsPCText:: ; 89f13 (22:5f13) +_AccessedBillsPCText:: text "Accessed BILL's" line "PC." @@ -1699,7 +1659,7 @@ _AccessedBillsPCText:: ; 89f13 (22:5f13) line "Storage System." prompt -_AccessedSomeonesPCText:: ; 89f45 (22:5f45) +_AccessedSomeonesPCText:: text "Accessed someone's" line "PC." @@ -1707,84 +1667,84 @@ _AccessedSomeonesPCText:: ; 89f45 (22:5f45) line "Storage System." prompt -_AccessedMyPCText:: ; 89f7a (22:5f7a) +_AccessedMyPCText:: text "Accessed my PC." para "Accessed Item" line "Storage System." prompt -_TurnedOnPC2Text:: ; 89fa9 (22:5fa9) +_TurnedOnPC2Text:: text $52, " turned on" line "the PC." prompt -_WhatDoYouWantText:: ; 89fbe (22:5fbe) +_WhatDoYouWantText:: text "What do you want" line "to do?" done -_WhatToDepositText:: ; 89fd7 (22:5fd7) +_WhatToDepositText:: text "What do you want" line "to deposit?" done -_DepositHowManyText:: ; 89ff5 (22:5ff5) +_DepositHowManyText:: text "How many?" done -_ItemWasStoredText:: ; 8a000 (22:6000) +_ItemWasStoredText:: TX_RAM wcd6d text " was" line "stored via PC." prompt -_NothingToDepositText:: ; 8a018 (22:6018) +_NothingToDepositText:: text "You have nothing" line "to deposit." prompt -_NoRoomToStoreText:: ; 8a036 (22:6036) +_NoRoomToStoreText:: text "No room left to" line "store items." prompt -_WhatToWithdrawText:: ; 8a054 (22:6054) +_WhatToWithdrawText:: text "What do you want" line "to withdraw?" done -_WithdrawHowManyText:: ; 8a073 (22:6073) +_WithdrawHowManyText:: text "How many?" done -_WithdrewItemText:: ; 8a07e (22:607e) +_WithdrewItemText:: text "Withdrew" line "@" TX_RAM wcd6d text "." prompt -_NothingStoredText:: ; 8a08f (22:608f) +_NothingStoredText:: text "There is nothing" line "stored." prompt -_CantCarryMoreText:: ; 8a0a9 (22:60a9) +_CantCarryMoreText:: text "You can't carry" line "any more items." prompt -_WhatToTossText:: ; 8a0c9 (22:60c9) +_WhatToTossText:: text "What do you want" line "to toss away?" done -_TossHowManyText:: ; 8a0e9 (22:60e9) +_TossHowManyText:: text "How many?" done -_AccessedHoFPCText:: ; 8a0f4 (22:60f4) +_AccessedHoFPCText:: text "Accessed #MON" line "LEAGUE's site." @@ -1792,27 +1752,20 @@ _AccessedHoFPCText:: ; 8a0f4 (22:60f4) line "OF FAME List." prompt -IF DEF(_YELLOW) -_SleepingPikachuText2:: - text "There isn't any" - line "response..." - prompt -ENDC - -_SwitchOnText:: ; 0x8a131 +_SwitchOnText:: text "Switch on!" prompt -_WhatText:: ; 0x8a13d +_WhatText:: text "What?" done -_DepositWhichMonText:: ; 0x8a144 +_DepositWhichMonText:: text "Deposit which" line "#MON?" done -_MonWasStoredText:: ; 0x8a159 +_MonWasStoredText:: TX_RAM wcf4b text " was" line "stored in Box @" @@ -1820,17 +1773,17 @@ _MonWasStoredText:: ; 0x8a159 text "." prompt -_CantDepositLastMonText:: ; 0x8a177 +_CantDepositLastMonText:: text "You can't deposit" line "the last #MON!" prompt -_BoxFullText:: ; 0x8a198 +_BoxFullText:: text "Oops! This Box is" line "full of #MON." prompt -_MonIsTakenOutText:: ; 0x8a1b9 +_MonIsTakenOutText:: TX_RAM wcf4b text " is" line "taken out." @@ -1839,12 +1792,12 @@ _MonIsTakenOutText:: ; 0x8a1b9 text "." prompt -_NoMonText:: ; 0x8a1d7 +_NoMonText:: text "What? There are" line "no #MON here!" prompt -_CantTakeMonText:: ; 0x8a1f6 +_CantTakeMonText:: text "You can't take" line "any more #MON." @@ -1852,20 +1805,12 @@ _CantTakeMonText:: ; 0x8a1f6 line "first." prompt -IF DEF(_YELLOW) -_PikachuUnhappyText:: - TX_RAM $cd6d - text "looks" - line "unhappy about it!" - prompt -ENDC - -_ReleaseWhichMonText:: ; 0x8a228 +_ReleaseWhichMonText:: text "Release which" line "#MON?" done -_OnceReleasedText:: ; 0x8a23d +_OnceReleasedText:: text "Once released," line "@" TX_RAM wcf4b @@ -1873,62 +1818,62 @@ _OnceReleasedText:: ; 0x8a23d cont "gone forever. OK?" done -_MonWasReleasedText:: ; 0x8a268 +_MonWasReleasedText:: TX_RAM wcf4b text " was" line "released outside." cont "Bye @" -_CF4BExclamationText:: ; 8a288 (22:6288) +_CF4BExclamationText:: TX_RAM wcf4b text "!" prompt -_RequireCoinCaseText:: ; 8a28e (22:628e) +_RequireCoinCaseText:: text "A COIN CASE is" line "required!@@" -_ExchangeCoinsForPrizesText:: ; 8a2a9 (22:62a9) +_ExchangeCoinsForPrizesText:: text "We exchange your" line "coins for prizes." prompt -_WhichPrizeText:: ; 8a2cd (22:62cd) +_WhichPrizeText:: text "Which prize do" line "you want?" done -_HereYouGoText:: ; 8a2e7 (22:62e7) +_HereYouGoText:: text "Here you go!@@" -_SoYouWantPrizeText:: ; 8a2f6 (22:62f6) +_SoYouWantPrizeText:: text "So, you want" line "@" TX_RAM wcd6d text "?" done -_SorryNeedMoreCoinsText:: ; 8a30b (22:630b) +_SorryNeedMoreCoinsText:: text "Sorry, you need" line "more coins.@@" -_OopsYouDontHaveEnoughRoomText:: ; 8a329 (22:6329) +_OopsYouDontHaveEnoughRoomText:: text "Oops! You don't" line "have enough room.@@" -_OhFineThenText:: ; 8a34c (22:634c) +_OhFineThenText:: text "Oh, fine then.@@" -_GetDexRatedText:: ; 8a35d (22:635d) +_GetDexRatedText:: text "Want to get your" line "#DEX rated?" done -_ClosedOaksPCText:: ; 8a37b (22:637b) +_ClosedOaksPCText:: text "Closed link to" line "PROF.OAK's PC.@@" -_AccessedOaksPCText:: ; 8a39a (22:639a) +_AccessedOaksPCText:: text "Accessed PROF." line "OAK's PC." @@ -1936,24 +1881,24 @@ _AccessedOaksPCText:: ; 8a39a (22:639a) line "Rating System." prompt -_WhereWouldYouLikeText:: ; 8a3d0 (22:63d0) +_WhereWouldYouLikeText:: text "Where would you" line "like to go?" done -_PleaseWaitText:: ; 8a3ed (22:63ed) +_PleaseWaitText:: text "OK, please wait" line "just a moment." done -_LinkCanceledText:: ; 8a40d (22:640d) +_LinkCanceledText:: text "The link was" line "canceled." done INCLUDE "text/oakspeech.asm" -_DoYouWantToNicknameText:: ; 0x8a605 +_DoYouWantToNicknameText:: text "Do you want to" line "give a nickname" cont "to @" @@ -1961,18 +1906,18 @@ _DoYouWantToNicknameText:: ; 0x8a605 text "?" done -_YourNameIsText:: ; 8a62f (22:662f) +_YourNameIsText:: text "Right! So your" line "name is ", $52, "!" prompt -_HisNameIsText:: ; 8a64a (22:664a) +_HisNameIsText:: text "That's right! I" line "remember now! His" cont "name is ", $53, "!" prompt -_WillBeTradedText:: ; 8a677 (22:6677) +_WillBeTradedText:: TX_RAM wNameOfPlayerMonToBeTraded text " and" line "@" @@ -1981,126 +1926,14 @@ _WillBeTradedText:: ; 8a677 (22:6677) cont "be traded." done -IF DEF(_YELLOW) -_Colosseum3MonsText:: - text "You need 3 #MON" - line "to fight!" - prompt - -_ColosseumMewText:: - text "Sorry, MEW can't" - line "attend!" - prompt - -_ColosseumDifferentMonsText:: - text "Your #MON must" - line "all be different!" - prompt - -_ColosseumMaxL55Text:: - text "No #MON can" - line "exceed L55!" - prompt - -_ColosseumMinL50Text:: - text "All #MON must" - line "be at least L50!" - prompt - -_ColosseumTotalL155Text:: - text "Your total levels" - line "exceed 155!" - prompt - -_ColosseumMaxL30Text:: - text "No #MON can" - line "exceed L30!" - prompt - -_ColosseumMinL25Text:: - text "All #MON must" - line "be at least L25!" - prompt - -_ColosseumTotalL80Text:: - text "Your total levels" - line "exceed 80!" - prompt - -_ColosseumMaxL20Text:: - text "No #MON can" - line "exceed L20!" - prompt - -_ColosseumMinL15Text:: - text "All #MON must" - line "be at least L15!" - prompt - -_ColosseumTotalL50Text:: - text "Your total levels" - line "exceed 50!" - prompt - -_ColosseumHeightText:: - TX_RAM $CD6D - text " is over" - line "6′8″ tall!" - prompt - -_ColosseumWeightText:: - TX_RAM $CD6D - text " weighs" - line "over 44 pounds!" - prompt - -_ColosseumEvolvedText:: - TX_RAM $CD6D - text " is an" - line "evolved #MON!" - prompt - -_ColosseumIneligibleText:: - text "Your opponent is" - line "ineligible." - prompt - -_ColosseumWhereToText:: - text "Where would you" - line "like to go?" - prompt - -_ColosseumPleaseWaitText:: - text "OK, please wait" - line "just a moment." - prompt - -_ColosseumCanceledText:: - text "The link was" - line "canceled." - prompt - -_ColosseumVersionText:: - text "The game versions" - line "don't match." - prompt -ENDC - -_Char00Text:: ; 8a696 (22:6696) +_Char00Text:: TX_NUM hSpriteIndexOrTextID,1,2 text " ERROR." done -_Char55Text:: ; 8a6a3 (22:66a3) +_Char55Text:: text $4B,"@@" -IF DEF(_YELLOW) -_NoPokemonText:: - text "There are no" - line "#MON here!" - prompt -ENDC - INCLUDE "text/maps/digletts_cave_route_2_entrance.asm" INCLUDE "text/maps/viridian_forest_exit.asm" INCLUDE "text/maps/route_2_house.asm" @@ -2177,28 +2010,28 @@ SECTION "Text 6", ROMX, BANK[TEXT_6] INCLUDE "text/maps/route_24_2.asm" INCLUDE "text/maps/route_25.asm" -_FileDataDestroyedText:: ; 945f1 (25:45f1) +_FileDataDestroyedText:: text "The file data is" line "destroyed!" prompt -_WouldYouLikeToSaveText:: ; 9460e (25:460e) +_WouldYouLikeToSaveText:: text "Would you like to" line "SAVE the game?" done -_GameSavedText:: ; 94630 (25:4630) +_GameSavedText:: text $52, " saved" line "the game!" done -_OlderFileWillBeErasedText:: ; 94643 (25:4643) +_OlderFileWillBeErasedText:: text "The older file" line "will be erased to" cont "save. Okay?" done -_WhenYouChangeBoxText:: ; 94671 (25:4671) +_WhenYouChangeBoxText:: text "When you change a" line "#MON BOX, data" cont "will be saved." @@ -2206,151 +2039,151 @@ _WhenYouChangeBoxText:: ; 94671 (25:4671) para "Is that okay?" done -_ChooseABoxText:: ; 946b0 (25:46b0) +_ChooseABoxText:: text "Choose a" line $4a, " BOX.@@" -_EvolvedText:: ; 946c2 (25:46c2) +_EvolvedText:: TX_RAM wcf4b text " evolved" done -_IntoText:: ; 946cf (25:46cf) +_IntoText:: db $0 line "into @" TX_RAM wcd6d text "!" done -_StoppedEvolvingText:: ; 946dd (25:46dd) +_StoppedEvolvingText:: text "Huh? @" TX_RAM wcf4b db $0 line "stopped evolving!" prompt -_IsEvolvingText:: ; 946fb (25:46fb) +_IsEvolvingText:: text "What? @" TX_RAM wcf4b db $0 line "is evolving!" done -_FellAsleepText:: ; 94715 (25:4715) +_FellAsleepText:: text $59 line "fell asleep!" prompt -_AlreadyAsleepText:: ; 94725 (25:4725) +_AlreadyAsleepText:: text $59, "'s" line "already asleep!" prompt -_PoisonedText:: ; 94739 (25:4739) +_PoisonedText:: text $59 line "was poisoned!" prompt -_BadlyPoisonedText:: ; 9474a (25:474a) +_BadlyPoisonedText:: text $59, "'s" line "badly poisoned!" prompt -_BurnedText:: ; 9475e (25:475e) +_BurnedText:: text $59 line "was burned!" prompt -_FrozenText:: ; 9476d (25:476d) +_FrozenText:: text $59 line "was frozen solid!" prompt -_FireDefrostedText:: ; 94782 (25:4782) +_FireDefrostedText:: text "Fire defrosted" line $59, "!" prompt -_MonsStatsRoseText:: ; 94795 (25:4795) +_MonsStatsRoseText:: text $5a, "'s" line "@" TX_RAM wcf4b text "@@" -_GreatlyRoseText:: ; 947a0 (25:47a0) +_GreatlyRoseText:: text $4c, "greatly@@" -_RoseText:: ; 947ab (25:47ab) +_RoseText:: text " rose!" prompt -_MonsStatsFellText:: ; 947b3 (25:47b3) +_MonsStatsFellText:: text $59, "'s" line "@" TX_RAM wcf4b text "@@" -_GreatlyFellText:: ; 947be (25:47be) +_GreatlyFellText:: text $4c, "greatly@@" -_FellText:: ; 947c9 (25:47c9) +_FellText:: text " fell!" prompt -_RanFromBattleText:: ; 947d1 (25:47d1) +_RanFromBattleText:: text $5a line "ran from battle!" prompt -_RanAwayScaredText:: ; 947e5 (25:47e5) +_RanAwayScaredText:: text $59 line "ran away scared!" prompt -_WasBlownAwayText:: ; 947f9 (25:47f9) +_WasBlownAwayText:: text $59 line "was blown away!" prompt -_ChargeMoveEffectText:: ; 9480c (25:480c) +_ChargeMoveEffectText:: text $5a, "@@" -_MadeWhirlwindText:: ; 94810 (25:4810) +_MadeWhirlwindText:: db $0 line "made a whirlwind!" prompt -_TookInSunlightText:: ; 94824 (25:4824) +_TookInSunlightText:: db $0 line "took in sunlight!" prompt -_LoweredItsHeadText:: ; 94838 (25:4838) +_LoweredItsHeadText:: db $0 line "lowered its head!" prompt -_SkyAttackGlowingText:: ; 9484c (25:484c) +_SkyAttackGlowingText:: db $0 line "is glowing!" prompt -_FlewUpHighText:: ; 9485a (25:485a) +_FlewUpHighText:: db $0 line "flew up high!" prompt -_DugAHoleText:: ; 9486a (25:486a) +_DugAHoleText:: db $0 line "dug a hole!" prompt -_BecameConfusedText:: ; 94878 (25:4878) +_BecameConfusedText:: text $59 line "became confused!" prompt -_MimicLearnedMoveText:: ; 9488c (25:488c) +_MimicLearnedMoveText:: text $5a line "learned" cont "@" @@ -2358,7 +2191,7 @@ _MimicLearnedMoveText:: ; 9488c (25:488c) text "!" prompt -_MoveWasDisabledText:: ; 9489e (25:489e) +_MoveWasDisabledText:: text $59, "'s" line "@" TX_RAM wcd6d @@ -2366,101 +2199,101 @@ _MoveWasDisabledText:: ; 9489e (25:489e) cont "disabled!" prompt -_NothingHappenedText:: ; 948b6 (25:48b6) +_NothingHappenedText:: text "Nothing happened!" prompt -_NoEffectText:: ; 948c9 (25:48c9) +_NoEffectText:: text "No effect!" prompt -_ButItFailedText:: ; 948d5 (25:48d5) +_ButItFailedText:: text "But, it failed! " prompt -_DidntAffectText:: ; 948e7 (25:48e7) +_DidntAffectText:: text "It didn't affect" line $59, "!" prompt -_IsUnaffectedText:: ; 948fb (25:48fb) +_IsUnaffectedText:: text $59 line "is unaffected!" prompt -_ParalyzedMayNotAttackText:: ; 9490d (25:490d) +_ParalyzedMayNotAttackText:: text $59, "'s" line "paralyzed! It may" cont "not attack!" prompt -_SubstituteText:: ; 9492f (25:492f) +_SubstituteText:: text "It created a" line "SUBSTITUTE!" prompt -_HasSubstituteText:: ; 94949 (25:4949) +_HasSubstituteText:: text $5a line "has a SUBSTITUTE!" prompt -_TooWeakSubstituteText:: ; 9495e (25:495e) +_TooWeakSubstituteText:: text "Too weak to make" line "a SUBSTITUTE!" prompt -_CoinsScatteredText:: ; 9497e (25:497e) +_CoinsScatteredText:: text "Coins scattered" line "everywhere!" prompt -_GettingPumpedText:: ; 9499b (25:499b) +_GettingPumpedText:: text $5a, "'s" line "getting pumped!" prompt -_WasSeededText:: ; 949af (25:49af) +_WasSeededText:: text $59 line "was seeded!" prompt -_EvadedAttackText:: ; 949be (25:49be) +_EvadedAttackText:: text $59 line "evaded attack!" prompt -_HitWithRecoilText:: ; 949d0 (25:49d0) +_HitWithRecoilText:: text $5a, "'s" line "hit with recoil!" prompt -_ConvertedTypeText:: ; 949e5 (25:49e5) +_ConvertedTypeText:: text "Converted type to" line $59, "'s!" prompt -_StatusChangesEliminatedText:: ; 949fc (25:49fc) +_StatusChangesEliminatedText:: text "All STATUS changes" line "are eliminated!" prompt -_StartedSleepingEffect:: ; 94a20 (25:4a20) +_StartedSleepingEffect:: text $5a line "started sleeping!" done -_FellAsleepBecameHealthyText:: ; 94a35 (25:4a35) +_FellAsleepBecameHealthyText:: text $5a line "fell asleep and" cont "became healthy!" done -_RegainedHealthText:: ; 94a58 (25:4a58) +_RegainedHealthText:: text $5a line "regained health!" prompt -_TransformedText:: ; 94a6c (25:4a6c) +_TransformedText:: text $5a line "transformed into" cont "@" @@ -2468,37 +2301,37 @@ _TransformedText:: ; 94a6c (25:4a6c) text "!" prompt -_LightScreenProtectedText:: ; 94a87 (25:4a87) +_LightScreenProtectedText:: text $5a, "'s" line "protected against" cont "special attacks!" prompt -_ReflectGainedArmorText:: ; 94aae (25:4aae) +_ReflectGainedArmorText:: text $5a line "gained armor!" prompt -_ShroudedInMistText:: ; 94abf (25:4abf) +_ShroudedInMistText:: text $5a, "'s" line "shrouded in mist!" prompt -_SuckedHealthText:: ; 94ad5 (25:4ad5) +_SuckedHealthText:: text "Sucked health from" line $59, "!" prompt -_DreamWasEatenText:: ; 94aec (25:4aec) +_DreamWasEatenText:: text $59, "'s" line "dream was eaten!" prompt -_TradeCenterText1:: ; 94b01 (25:4b01) +_TradeCenterText1:: text "!" done -_ColosseumText1:: ; 94b04 (25:4b04) +_ColosseumText1:: text "!" done @@ -2602,18 +2435,18 @@ INCLUDE "text/maps/silph_co_1f.asm" INCLUDE "text/maps/saffron_pokecenter.asm" INCLUDE "text/maps/mr_psychics_house.asm" -_PokemartGreetingText:: ; a259c (28:659c) +_PokemartGreetingText:: text "Hi there!" next "May I help you?" done -_PokemonFaintedText:: ; a25b7 (28:65b7) +_PokemonFaintedText:: TX_RAM wcd6d db $0 line "fainted!" done -_PlayerBlackedOutText:: ; a25c5 (28:65c5) +_PlayerBlackedOutText:: text $52, " is out of" line "useable #MON!" @@ -2621,16 +2454,16 @@ _PlayerBlackedOutText:: ; a25c5 (28:65c5) line "out!" prompt -_RepelWoreOffText:: ; a25ef (28:65ef) +_RepelWoreOffText:: text "REPEL's effect" line "wore off." done -_PokemartBuyingGreetingText:: ; a2608 (28:6608) +_PokemartBuyingGreetingText:: text "Take your time." done -_PokemartTellBuyPriceText:: ; a2619 (28:6619) +_PokemartTellBuyPriceText:: TX_RAM wcf4b text "?" line "That will be" @@ -2639,72 +2472,72 @@ _PokemartTellBuyPriceText:: ; a2619 (28:6619) text ". OK?" done -_PokemartBoughtItemText:: ; a2639 (28:6639) +_PokemartBoughtItemText:: text "Here you are!" line "Thank you!" prompt -_PokemartNotEnoughMoneyText:: ; a2653 (28:6653) +_PokemartNotEnoughMoneyText:: text "You don't have" line "enough money." prompt -_PokemartItemBagFullText:: ; a2670 (28:6670) +_PokemartItemBagFullText:: text "You can't carry" line "any more items." prompt -_PokemonSellingGreetingText:: ; a2690 (28:6690) +_PokemonSellingGreetingText:: text "What would you" line "like to sell?" done -_PokemartTellSellPriceText:: ; a26ae (28:66ae) +_PokemartTellSellPriceText:: text "I can pay you" line "¥@" TX_BCD hMoney, $c3 text " for that." done -_PokemartItemBagEmptyText:: ; a26cf (28:66cf) +_PokemartItemBagEmptyText:: text "You don't have" line "anything to sell." prompt -_PokemartUnsellableItemText:: ; a26f0 (28:66f0) +_PokemartUnsellableItemText:: text "I can't put a" line "price on that." prompt -_PokemartThankYouText:: ; a270d (28:670d) +_PokemartThankYouText:: text "Thank you!" done -_PokemartAnythingElseText:: ; a2719 (28:6719) +_PokemartAnythingElseText:: text "Is there anything" line "else I can do?" done -_LearnedMove1Text:: ; a273b (28:673b) +_LearnedMove1Text:: TX_RAM wLearnMoveMonName text " learned" line "@" TX_RAM wcf4b text "!@@" -_WhichMoveToForgetText:: ; a2750 (28:6750) +_WhichMoveToForgetText:: text "Which move should" next "be forgotten?" done -_AbandonLearningText:: ; a2771 (28:6771) +_AbandonLearningText:: text "Abandon learning" line "@" TX_RAM wcf4b text "?" done -_DidNotLearnText:: ; a278a (28:678a) +_DidNotLearnText:: TX_RAM wLearnMoveMonName db $0 line "did not learn" @@ -2713,7 +2546,7 @@ _DidNotLearnText:: ; a278a (28:678a) text "!" prompt -_TryingToLearnText:: ; a27a4 (28:67a4) +_TryingToLearnText:: TX_RAM wLearnMoveMonName text " is" line "trying to learn" @@ -2734,13 +2567,13 @@ _TryingToLearnText:: ; a27a4 (28:67a4) text "?" done -_OneTwoAndText:: ; a2819 (28:6819) +_OneTwoAndText:: text "1, 2 and...@@" -_PoofText:: ; a2827 (28:6827) +_PoofText:: text " Poof!@@" -_ForgotAndText:: ; a2830 (28:6830) +_ForgotAndText:: db $0 para "@" TX_RAM wLearnMoveMonName @@ -2752,12 +2585,12 @@ _ForgotAndText:: ; a2830 (28:6830) para "And..." prompt -_HMCantDeleteText:: ; a284d (28:684d) +_HMCantDeleteText:: text "HM techniques" line "can't be deleted!" prompt -_PokemonCenterWelcomeText:: ; a286d (28:686d) +_PokemonCenterWelcomeText:: text "Welcome to our" line "#MON CENTER!" @@ -2766,40 +2599,40 @@ _PokemonCenterWelcomeText:: ; a286d (28:686d) cont "perfect health!" prompt -_ShallWeHealYourPokemonText:: ; a28b4 (28:68b4) +_ShallWeHealYourPokemonText:: text "Shall we heal your" line "#MON?" done -_NeedYourPokemonText:: ; a28ce (28:68ce) +_NeedYourPokemonText:: text "OK. We'll need" line "your #MON." done -_PokemonFightingFitText:: ; a28e8 (28:68e8) +_PokemonFightingFitText:: text "Thank you!" line "Your #MON are" cont "fighting fit!" prompt -_PokemonCenterFarewellText:: ; a2910 (28:6910) +_PokemonCenterFarewellText:: text "We hope to see" line "you again!" done -_CableClubNPCAreaReservedFor2FriendsLinkedByCableText:: ; a292b (28:692b) +_CableClubNPCAreaReservedFor2FriendsLinkedByCableText:: text "This area is" line "reserved for 2" cont "friends who are" cont "linked by cable." done -_CableClubNPCWelcomeText:: ; a2969 (28:6969) +_CableClubNPCWelcomeText:: text "Welcome to the" line "Cable Club!" done -_CableClubNPCPleaseApplyHereHaveToSaveText:: ; a2985 (28:6985) +_CableClubNPCPleaseApplyHereHaveToSaveText:: text "Please apply here." para "Before opening" @@ -2807,10 +2640,10 @@ _CableClubNPCPleaseApplyHereHaveToSaveText:: ; a2985 (28:6985) cont "to save the game." done -_CableClubNPCPleaseWaitText:: ; a29cc (28:69cc) +_CableClubNPCPleaseWaitText:: text "Please wait.@@" -_CableClubNPCLinkClosedBecauseOfInactivityText:: ; a29db (28:69db) +_CableClubNPCLinkClosedBecauseOfInactivityText:: text "The link has been" line "closed because of" cont "inactivity." @@ -2823,86 +2656,86 @@ _CableClubNPCLinkClosedBecauseOfInactivityText:: ; a29db (28:69db) SECTION "Text 10", ROMX, BANK[TEXT_10] -_CableClubNPCPleaseComeAgainText:: ; a4000 (29:4000) +_CableClubNPCPleaseComeAgainText:: text "Please come again!" done -_CableClubNPCMakingPreparationsText:: ; a4014 (29:4014) +_CableClubNPCMakingPreparationsText:: text "We're making" line "preparations." cont "Please wait." done -_UsedStrengthText:: ; a403c (29:403c) +_UsedStrengthText:: TX_RAM wcd6d text " used" line "STRENGTH.@@" -_CanMoveBouldersText:: ; a4051 (29:4051) +_CanMoveBouldersText:: TX_RAM wcd6d text " can" line "move boulders." prompt -_CurrentTooFastText:: ; a4069 (29:4069) +_CurrentTooFastText:: text "The current is" line "much too fast!" prompt -_CyclingIsFunText:: ; a4088 (29:4088) +_CyclingIsFunText:: text "Cycling is fun!" line "Forget SURFing!" prompt -_FlashLightsAreaText:: ; a40a9 (29:40a9) +_FlashLightsAreaText:: text "A blinding FLASH" line "lights the area!" prompt -_WarpToLastPokemonCenterText:: ; a40cc (29:40cc) +_WarpToLastPokemonCenterText:: text "Warp to the last" line "#MON CENTER." done -_CannotUseTeleportNowText:: ; a40eb (29:40eb) +_CannotUseTeleportNowText:: TX_RAM wcd6d text " can't" line "use TELEPORT now." prompt -_CannotFlyHereText:: ; a4107 (29:4107) +_CannotFlyHereText:: TX_RAM wcd6d text " can't" line "FLY here." prompt -_NotHealthyEnoughText:: ; a411b (29:411b) +_NotHealthyEnoughText:: text "Not healthy" line "enough." prompt -_NewBadgeRequiredText:: ; a4130 (29:4130) +_NewBadgeRequiredText:: text "No! A new BADGE" line "is required." prompt -_CannotUseItemsHereText:: ; a414e (29:414e) +_CannotUseItemsHereText:: text "You can't use items" line "here." prompt -_CannotGetOffHereText:: ; a4168 (29:4168) +_CannotGetOffHereText:: text "You can't get off" line "here." prompt -_GotMonText:: ; a4180 (29:4180) +_GotMonText:: text $52, " got" line "@" TX_RAM wcd6d text "!@@" -_SetToBoxText:: ; a418f (29:418f) +_SetToBoxText:: text "There's no more" line "room for #MON!" cont "@" @@ -2914,7 +2747,7 @@ _SetToBoxText:: ; a418f (29:418f) text " on PC!" done -_BoxIsFullText:: ; a41d6 (29:41d6) +_BoxIsFullText:: text "There's no more" line "room for #MON!" @@ -2937,7 +2770,7 @@ INCLUDE "text/maps/fuchsia_city.asm" INCLUDE "text/maps/cinnabar_island.asm" INCLUDE "text/maps/saffron_city.asm" -_ItemUseBallText00:: ; a6729 (29:6729) +_ItemUseBallText00:: text "It dodged the" line "thrown BALL!" @@ -2945,67 +2778,67 @@ _ItemUseBallText00:: ; a6729 (29:6729) line "can't be caught!" prompt -_ItemUseBallText01:: ; a675f (29:675f) +_ItemUseBallText01:: text "You missed the" line "#MON!" prompt -_ItemUseBallText02:: ; a6775 (29:6775) +_ItemUseBallText02:: text "Darn! The #MON" line "broke free!" prompt -_ItemUseBallText03:: ; a6791 (29:6791) +_ItemUseBallText03:: text "Aww! It appeared" line "to be caught! " prompt -_ItemUseBallText04:: ; a67b2 (29:67b2) +_ItemUseBallText04:: text "Shoot! It was so" line "close too!" prompt -_ItemUseBallText05:: ; a67cf (29:67cf) +_ItemUseBallText05:: text "All right!" line "@" TX_RAM wEnemyMonNick text " was" cont "caught!@@" -_ItemUseBallText07:: ; a67ee (29:67ee) +_ItemUseBallText07:: TX_RAM wBoxMonNicks text " was" line "transferred to" cont "BILL's PC!" prompt -_ItemUseBallText08:: ; a6810 (29:6810) +_ItemUseBallText08:: TX_RAM wBoxMonNicks text " was" line "transferred to" cont "someone's PC!" prompt -_ItemUseBallText06:: ; a6835 (29:6835) +_ItemUseBallText06:: text "New #DEX data" line "will be added for" cont "@" TX_RAM wEnemyMonNick text "!@@" -_SurfingGotOnText:: ; a685e (29:685e) +_SurfingGotOnText:: text $52, " got on" line "@" TX_RAM wcd6d text "!" prompt -_SurfingNoPlaceToGetOffText:: ; a686f (29:686f) +_SurfingNoPlaceToGetOffText:: text "There's no place" line "to get off!" prompt -_VitaminStatRoseText:: ; a688c (29:688c) +_VitaminStatRoseText:: TX_RAM wcd6d text "'s" line "@" @@ -3013,22 +2846,22 @@ _VitaminStatRoseText:: ; a688c (29:688c) text " rose." prompt -_VitaminNoEffectText:: ; a689e (29:689e) +_VitaminNoEffectText:: text "It won't have any" line "effect." prompt -_ThrewBaitText:: ; a68b8 (29:68b8) +_ThrewBaitText:: text $52, " threw" line "some BAIT." done -_ThrewRockText:: ; a68cc (29:68cc) +_ThrewRockText:: text $52, " threw a" line "ROCK." done -_PlayedFluteNoEffectText:: ; a68dd (29:68dd) +_PlayedFluteNoEffectText:: text "Played the #" line "FLUTE." @@ -3036,68 +2869,68 @@ _PlayedFluteNoEffectText:: ; a68dd (29:68dd) line "catchy tune!" prompt -_FluteWokeUpText:: ; a690c (29:690c) +_FluteWokeUpText:: text "All sleeping" line "#MON woke up." prompt -_PlayedFluteHadEffectText:: ; a6928 (29:6928) +_PlayedFluteHadEffectText:: text $52, " played the" line "# FLUTE.@@" -_CoinCaseNumCoinsText:: ; a6940 (29:6940) +_CoinCaseNumCoinsText:: text "Coins" line "@" TX_BCD wPlayerCoins, $c2 text " " prompt -_ItemfinderFoundItemText:: ; a694f (29:694f) +_ItemfinderFoundItemText:: text "Yes! ITEMFINDER" line "indicates there's" cont "an item nearby." prompt -_ItemfinderFoundNothingText:: ; a6981 (29:6981) +_ItemfinderFoundNothingText:: text "Nope! ITEMFINDER" line "isn't responding." prompt -_RaisePPWhichTechniqueText:: ; a69a4 (29:69a4) +_RaisePPWhichTechniqueText:: text "Raise PP of which" line "technique?" done -_RestorePPWhichTechniqueText:: ; a69c2 (29:69c2) +_RestorePPWhichTechniqueText:: text "Restore PP of" line "which technique?" done -_PPMaxedOutText:: ; a69e2 (29:69e2) +_PPMaxedOutText:: TX_RAM wcf4b text "'s PP" line "is maxed out." prompt -_PPIncreasedText:: ; a69f9 (29:69f9) +_PPIncreasedText:: TX_RAM wcf4b text "'s PP" line "increased." prompt -_PPRestoredText:: ; a6a0d (29:6a0d) +_PPRestoredText:: text "PP was restored." prompt -_BootedUpTMText:: ; a6a1f (29:6a1f) +_BootedUpTMText:: text "Booted up a TM!" prompt -_BootedUpHMText:: ; a6a30 (29:6a30) +_BootedUpHMText:: text "Booted up an HM!" prompt -_TeachMachineMoveText:: ; a6a42 (29:6a42) +_TeachMachineMoveText:: text "It contained" line "@" TX_RAM wcf4b @@ -3109,7 +2942,7 @@ _TeachMachineMoveText:: ; a6a42 (29:6a42) line "to a #MON?" done -_MonCannotLearnMachineMoveText:: ; a6a6e (29:6a6e) +_MonCannotLearnMachineMoveText:: TX_RAM wcd6d text " is not" line "compatible with" @@ -3123,44 +2956,44 @@ _MonCannotLearnMachineMoveText:: ; a6a6e (29:6a6e) text "." prompt -_ItemUseNotTimeText:: ; a6aa6 (29:6aa6) +_ItemUseNotTimeText:: text "OAK: ", $52, "!" line "This isn't the" cont "time to use that! " prompt -_ItemUseNotYoursToUseText:: ; a6ad0 (29:6ad0) +_ItemUseNotYoursToUseText:: text "This isn't yours" line "to use!" prompt -_ItemUseNoEffectText:: ; a6ae9 (29:6ae9) +_ItemUseNoEffectText:: text "It won't have any" line "effect." prompt -_ThrowBallAtTrainerMonText1:: ; a6b03 (29:6b03) +_ThrowBallAtTrainerMonText1:: text "The trainer" line "blocked the BALL!" prompt -_ThrowBallAtTrainerMonText2:: ; a6b22 (29:6b22) +_ThrowBallAtTrainerMonText2:: text "Don't be a thief!" prompt -_NoCyclingAllowedHereText:: ; a6b34 (29:6b34) +_NoCyclingAllowedHereText:: text "No cycling" next "allowed here." prompt -_NoSurfingHereText:: ; a6b4e (29:6b4e) +_NoSurfingHereText:: text "No SURFing on" line "@" TX_RAM wcd6d text " here!" prompt -_BoxFullCannotThrowBallText:: ; a6b69 (29:6b69) +_BoxFullCannotThrowBallText:: text "The #MON BOX" line "is full! Can't" cont "use that item!" @@ -3169,51 +3002,51 @@ _BoxFullCannotThrowBallText:: ; a6b69 (29:6b69) SECTION "Text 11", ROMX, BANK[TEXT_11] -_ItemUseText001:: ; a8000 (2a:4000) +_ItemUseText001:: text $52," used@@" -_ItemUseText002:: ; a8009 (2a:4009) +_ItemUseText002:: TX_RAM wcf4b text "!" done -_GotOnBicycleText1:: ; a800f (2a:400f) +_GotOnBicycleText1:: text $52, " got on the@@" -_GotOnBicycleText2:: ; a801e (2a:401e) +_GotOnBicycleText2:: TX_RAM wcf4b text "!" prompt -_GotOffBicycleText1:: ; a8024 (2a:4024) +_GotOffBicycleText1:: text $52, " got off@@" -_GotOffBicycleText2:: ; a8030 (2a:4030) +_GotOffBicycleText2:: text "the @" TX_RAM wcf4b text "." prompt -_ThrewAwayItemText:: ; a803c (2a:403c) +_ThrewAwayItemText:: text "Threw away" line "@" TX_RAM wcd6d text "." prompt -_IsItOKToTossItemText:: ; a804f (2a:404f) +_IsItOKToTossItemText:: text "Is it OK to toss" line "@" TX_RAM wcf4b text "?" prompt -_TooImportantToTossText:: ; a8068 (2a:4068) +_TooImportantToTossText:: text "That's too impor-" line "tant to toss!" prompt -_AlreadyKnowsText:: ; a8088 (2a:4088) +_AlreadyKnowsText:: TX_RAM wcd6d text " knows" line "@" @@ -3221,12 +3054,12 @@ _AlreadyKnowsText:: ; a8088 (2a:4088) text "!" prompt -_ConnectCableText:: ; a809a (2a:409a) +_ConnectCableText:: text "Okay, connect the" line "cable like so!" prompt -_TradedForText:: ; a80bc (2a:40bc) +_TradedForText:: text $52, " traded" line "@" TX_RAM wInGameTradeGiveMonName @@ -3235,7 +3068,7 @@ _TradedForText:: ; a80bc (2a:40bc) TX_RAM wInGameTradeReceiveMonName text "!@@" -_WannaTrade1Text:: ; a80d8 (2a:40d8) +_WannaTrade1Text:: text "I'm looking for" line "@" TX_RAM wInGameTradeGiveMonName @@ -3247,12 +3080,12 @@ _WannaTrade1Text:: ; a80d8 (2a:40d8) text "? " done -_NoTrade1Text:: ; a810b (2a:410b) +_NoTrade1Text:: text "Awww!" line "Oh well..." done -_WrongMon1Text:: ; a811d (2a:411d) +_WrongMon1Text:: text "What? That's not" line "@" TX_RAM wInGameTradeGiveMonName @@ -3262,18 +3095,18 @@ _WrongMon1Text:: ; a811d (2a:411d) line "come back here!" done -_Thanks1Text:: ; a8155 (2a:4155) +_Thanks1Text:: text "Hey thanks!" done -_AfterTrade1Text:: ; a8162 (2a:4162) +_AfterTrade1Text:: text "Isn't my old" line "@" TX_RAM wInGameTradeReceiveMonName text " great?" done -_WannaTrade2Text:: ; a817c (2a:417c) +_WannaTrade2Text:: text "Hello there! Do" line "you want to trade" @@ -3285,12 +3118,12 @@ _WannaTrade2Text:: ; a817c (2a:417c) text "?" done -_NoTrade2Text:: ; a81b5 (2a:41b5) +_NoTrade2Text:: text "Well, if you" line "don't want to..." done -_WrongMon2Text:: ; a81d3 (2a:41d3) +_WrongMon2Text:: text "Hmmm? This isn't" line "@" TX_RAM wInGameTradeGiveMonName @@ -3300,28 +3133,20 @@ _WrongMon2Text:: ; a81d3 (2a:41d3) line "you get one." done -_Thanks2Text:: ; a8209 (2a:4209) +_Thanks2Text:: text "Thanks!" done -_AfterTrade2Text:: ; a8212 (2a:4212) -IF DEF(_YELLOW) - text "Hello there! Your" - line "old @" - TX_RAM wcd13 - db " is" - cont "magnificent!" -ELSE +_AfterTrade2Text:: text "The @" TX_RAM wInGameTradeGiveMonName text " you" line "traded to me" para "went and evolved!" -ENDC done -_WannaTrade3Text:: ; a8240 (2a:4240) +_WannaTrade3Text:: text "Hi! Do you have" line "@" TX_RAM wInGameTradeGiveMonName @@ -3333,11 +3158,11 @@ _WannaTrade3Text:: ; a8240 (2a:4240) text "?" done -_NoTrade3Text:: ; a8274 (2a:4274) +_NoTrade3Text:: text "That's too bad." done -_WrongMon3Text:: ; a8284 (2a:4284) +_WrongMon3Text:: text "...This is no" line "@" TX_RAM wInGameTradeGiveMonName @@ -3347,15 +3172,11 @@ _WrongMon3Text:: ; a8284 (2a:4284) line "trade it with me!" done -_Thanks3Text:: ; a82bc (2a:42bc) -IF DEF(_YELLOW) - text "Thanks, pal!" -ELSE +_Thanks3Text:: text "Thanks pal!" -ENDC done -_AfterTrade3Text:: ; a82c9 (2a:42c9) +_AfterTrade3Text:: text "How is my old" line "@" TX_RAM wInGameTradeReceiveMonName @@ -3367,12 +3188,12 @@ _AfterTrade3Text:: ; a82c9 (2a:42c9) line "doing great!" done -_NothingToCutText:: ; a82f8 (2a:42f8) +_NothingToCutText:: text "There isn't" line "anything to CUT!" prompt -_UsedCutText:: ; a8315 (2a:4315) +_UsedCutText:: TX_RAM wcd6d text " hacked" line "away with CUT!" @@ -3387,4 +3208,3 @@ INCLUDE "text/pokedex.asm" SECTION "Move Names", ROMX, BANK[MOVE_NAMES] INCLUDE "text/move_names.asm" - -- cgit v1.3.1-sl0p From 351146024bdd386c328af0f2abdb04e728e4c133 Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 14 Dec 2015 22:09:30 -0600 Subject: Fewer underscores in constants --- constants/item_constants.asm | 6 ++--- constants/pokedex_constants.asm | 2 +- constants/pokemon_constants.asm | 2 +- constants/trainer_constants.asm | 6 ++--- data/baseStats/farfetchd.asm | 2 +- data/evos_moves.asm | 2 +- data/item_prices.asm | 6 ++--- data/mapObjects/celadongym.asm | 2 +- data/mapObjects/ceruleangym.asm | 2 +- data/mapObjects/pewtergym.asm | 2 +- data/mapObjects/rocktunnel1.asm | 6 ++--- data/mapObjects/rocktunnel2.asm | 4 +-- data/mapObjects/route10.asm | 4 +-- data/mapObjects/route12.asm | 2 +- data/mapObjects/route13.asm | 8 +++--- data/mapObjects/route15.asm | 8 +++--- data/mapObjects/route20.asm | 4 +-- data/mapObjects/route24.asm | 4 +-- data/mapObjects/route25.asm | 2 +- data/mapObjects/route6.asm | 8 +++--- data/mapObjects/route9.asm | 8 +++--- data/mapObjects/vermiliongym.asm | 2 +- data/mapObjects/victoryroad2.asm | 2 +- data/mart_inventories.asm | 2 +- data/mon_palettes.asm | 2 +- data/pokedex_order.asm | 2 +- data/trades.asm | 40 ++++++++++++++-------------- data/trainer_moves.asm | 2 +- data/trainer_parties.asm | 6 ++--- data/trainer_types.asm | 2 +- data/wildPokemon/route12.asm | 4 +-- data/wildPokemon/route13.asm | 4 +-- engine/battle/core.asm | 2 +- engine/battle/moveEffects/pay_day_effect.asm | 2 +- engine/battle/trainer_ai.asm | 8 +++--- engine/items/items.asm | 6 ++--- scripts/billshouse.asm | 2 +- scripts/route15gateupstairs.asm | 2 +- scripts/vermilioncity.asm | 4 +-- 39 files changed, 92 insertions(+), 92 deletions(-) diff --git a/constants/item_constants.asm b/constants/item_constants.asm index d0ad12e6..fe6fcb15 100755 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -56,7 +56,7 @@ SAFARI_ROCK EQU $16 ; overload const FULL_HEAL ; $34 const REVIVE ; $35 const MAX_REVIVE ; $36 - const GUARD_SPEC_ ; $37 + const GUARD_SPEC ; $37 const SUPER_REPEL ; $38 const MAX_REPEL ; $39 const DIRE_HIT ; $3A @@ -64,7 +64,7 @@ SAFARI_ROCK EQU $16 ; overload const FRESH_WATER ; $3C const SODA_POP ; $3D const LEMONADE ; $3E - const S_S__TICKET ; $3F + const S_S_TICKET ; $3F const GOLD_TEETH ; $40 const X_ATTACK ; $41 const X_DEFEND ; $42 @@ -76,7 +76,7 @@ SAFARI_ROCK EQU $16 ; overload const SILPH_SCOPE ; $48 const POKE_FLUTE ; $49 const LIFT_KEY ; $4A - const EXP__ALL ; $4B + const EXP_ALL ; $4B const OLD_ROD ; $4C const GOOD_ROD ; $4D const SUPER_ROD ; $4E diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 036426ed..360fbb4c 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -82,7 +82,7 @@ const_value = 1 const DEX_SLOWBRO ; 80 const DEX_MAGNEMITE ; 81 const DEX_MAGNETON ; 82 - const DEX_FARFETCH_D ; 83 + const DEX_FARFETCHD ; 83 const DEX_DODUO ; 84 const DEX_DODRIO ; 85 const DEX_SEEL ; 86 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 255d601a..96d44ef5 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -63,7 +63,7 @@ const_value = 1 const MISSINGNO_3D ; $3D const MISSINGNO_3E ; $3E const MISSINGNO_3F ; $3F - const FARFETCH_D ; $40 + const FARFETCHD ; $40 const VENONAT ; $41 const DRAGONITE ; $42 const MISSINGNO_43 ; $43 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 0f6be1e8..ee890282 100755 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -10,8 +10,8 @@ const_value = 1 trainer_const BUG_CATCHER ; $02 trainer_const LASS ; $03 trainer_const SAILOR ; $04 - trainer_const JR__TRAINER_M ; $05 - trainer_const JR__TRAINER_F ; $06 + trainer_const JR_TRAINER_M ; $05 + trainer_const JR_TRAINER_F ; $06 trainer_const POKEMANIAC ; $07 trainer_const SUPER_NERD ; $08 trainer_const HIKER ; $09 @@ -41,7 +41,7 @@ const_value = 1 trainer_const BRUNO ; $21 trainer_const BROCK ; $22 trainer_const MISTY ; $23 - trainer_const LT__SURGE ; $24 + trainer_const LT_SURGE ; $24 trainer_const ERIKA ; $25 trainer_const KOGA ; $26 trainer_const BLAINE ; $27 diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm index 015e9ff8..a1084b17 100755 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -1,5 +1,5 @@ FarfetchdBaseStats: ; 38cd6 (e:4cd6) -db DEX_FARFETCH_D ; pokedex id +db DEX_FARFETCHD ; pokedex id db 52 ; base hp db 65 ; base attack db 55 ; base defense diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 6bdf2524..29a33479 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -943,7 +943,7 @@ Mon159_EvosMoves: ; 3b4e1 (e:74e1) db 0 Mon083_EvosMoves: ; 3b4e3 (e:74e3) -;FARFETCH_D +;FARFETCHD ;Evolutions db 0 ;Learnset diff --git a/data/item_prices.asm b/data/item_prices.asm index aa5cb21e..c36e1c69 100755 --- a/data/item_prices.asm +++ b/data/item_prices.asm @@ -53,7 +53,7 @@ ItemPrices: ; 4608 (1:4608) money 600 ; FULL_HEAL money 1500 ; REVIVE money 4000 ; MAX_REVIVE - money 700 ; GUARD_SPEC_ + money 700 ; GUARD_SPEC money 500 ; SUPER_REPEL money 700 ; MAX_REPEL money 650 ; DIRE_HIT @@ -61,7 +61,7 @@ ItemPrices: ; 4608 (1:4608) money 200 ; FRESH_WATER money 300 ; SODA_POP money 350 ; LEMONADE - money 0 ; S_S__TICKET + money 0 ; S_S_TICKET money 0 ; GOLD_TEETH money 500 ; X_ATTACK money 550 ; X_DEFEND @@ -73,7 +73,7 @@ ItemPrices: ; 4608 (1:4608) money 0 ; SILPH_SCOPE money 0 ; POKE_FLUTE money 0 ; LIFT_KEY - money 0 ; EXP__ALL + money 0 ; EXP_ALL money 0 ; OLD_ROD money 0 ; GOOD_ROD money 0 ; SUPER_ROD diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index f9c20c90..a38dd535 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -11,7 +11,7 @@ CeladonGymObject: ; 0x48b30 (size=84) object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1 object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11 object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1 - object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR__TRAINER_F, $b + object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR_TRAINER_F, $b object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2 object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12 object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3 diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index d87c9c20..68d74547 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -9,7 +9,7 @@ CeruleanGymObject: ; 0x5c834 (size=50) db $4 ; objects object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1 - object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR__TRAINER_F, $1 + object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR_TRAINER_F, $1 object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1 object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index 69196193..b0224a11 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -9,7 +9,7 @@ PewterGymObject: ; 0x5c52e (size=42) db $3 ; objects object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1 - object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR__TRAINER_M, $1 + object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR_TRAINER_M, $1 object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person ; warp-to diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index b4001df9..70ffa438 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -19,9 +19,9 @@ RockTunnel1Object: ; 0x445f6 (size=127) object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7 - object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR__TRAINER_F, $11 - object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR__TRAINER_F, $12 - object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR__TRAINER_F, $13 + object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR_TRAINER_F, $11 + object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR_TRAINER_F, $12 + object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR_TRAINER_F, $13 ; warp-to EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index dfc36cac..e343fc0b 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -10,12 +10,12 @@ RockTunnel2Object: ; 0x4613d (size=100) db $0 ; signs db $8 ; objects - object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR__TRAINER_F, $9 + object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR_TRAINER_F, $9 object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, OPP_HIKER, $9 object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, OPP_POKEMANIAC, $3 object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, OPP_POKEMANIAC, $4 object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, OPP_HIKER, $a - object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR__TRAINER_F, $a + object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR_TRAINER_F, $a object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, OPP_HIKER, $b object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index e324a348..3623b79f 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -17,9 +17,9 @@ Route10Object: ; 0x582f6 (size=96) object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1 object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7 object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2 - object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR__TRAINER_F, $7 + object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR_TRAINER_F, $7 object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8 - object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR__TRAINER_F, $8 + object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8 ; warp-to EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 0d0ef1c0..8ed43ff4 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -15,7 +15,7 @@ Route12Object: ; 0x5869a (size=118) object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3 object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4 - object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR__TRAINER_M, $9 + object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR_TRAINER_M, $9 object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2 object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5 object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6 diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index 1512ce3a..e6fdf8e6 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -10,10 +10,10 @@ Route13Object: ; 0x5482e (size=93) db $a ; objects object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1 - object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR__TRAINER_F, $c - object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR__TRAINER_F, $d - object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR__TRAINER_F, $e - object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR__TRAINER_F, $f + object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR_TRAINER_F, $c + object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR_TRAINER_F, $d + object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR_TRAINER_F, $e + object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR_TRAINER_F, $f object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2 object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4 object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5 diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 95016038..e0d19e5c 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -11,16 +11,16 @@ Route15Object: ; 0x5894e (size=126) db $9, $27, $c ; Route15Text12 db $b ; objects - object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR__TRAINER_F, $14 - object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR__TRAINER_F, $15 + object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14 + object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR_TRAINER_F, $15 object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6 object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7 object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9 object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3 object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4 - object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR__TRAINER_F, $16 - object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR__TRAINER_F, $17 + object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR_TRAINER_F, $16 + object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR_TRAINER_F, $17 object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 ; warp-to diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 8e6b5a78..6939ffad 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -13,12 +13,12 @@ Route20Object: ; 0x50113 (size=106) object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9 object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6 - object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $18 + object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $18 object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7 - object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR__TRAINER_F, $10 + object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR_TRAINER_F, $10 object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8 ; warp-to diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index b61ff713..f8173c9d 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -7,8 +7,8 @@ Route24Object: ; 0x506a4 (size=67) db $8 ; objects object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6 - object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR__TRAINER_M, $2 - object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR__TRAINER_M, $3 + object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $2 + object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3 object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7 object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4 object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index 62fa8e77..5c6811f3 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -10,7 +10,7 @@ Route25Object: ; 0x507b2 (size=94) db $a ; objects object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5 object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6 - object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR__TRAINER_M, $2 + object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR_TRAINER_M, $2 object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9 object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7 object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index d901e865..19ac2a8a 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -11,11 +11,11 @@ Route6Object: ; 0x58022 (size=87) db $f, $13, $7 ; Route6Text7 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR__TRAINER_M, $4 - object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR__TRAINER_F, $2 + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4 + object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2 object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a - object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR__TRAINER_M, $5 - object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR__TRAINER_F, $3 + object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5 + object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3 object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b ; warp-to diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index a70b208f..79d0d5ed 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -7,10 +7,10 @@ Route9Object: ; 0x546a8 (size=86) db $7, $19, $b ; Route9Text11 db $a ; objects - object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR__TRAINER_F, $5 - object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR__TRAINER_M, $7 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR__TRAINER_M, $8 - object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $6 + object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8 + object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6 object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, OPP_HIKER, $6 object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, OPP_BUG_CATCHER, $d diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 830af62c..892403a3 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -8,7 +8,7 @@ VermilionGymObject: ; 0x5cbfe (size=58) db $0 ; signs db $5 ; objects - object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT__SURGE, $1 + object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT_SURGE, $1 object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, OPP_GENTLEMAN, $3 object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, OPP_ROCKER, $1 object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, OPP_SAILOR, $8 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 29c0f303..348cae03 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -22,7 +22,7 @@ VictoryRoad2Object: ; 0x51915 (size=154) object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17 object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL object SPRITE_BALL, $9, $b, STAY, NONE, $9, TM_05 - object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC_ + object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC object SPRITE_BOULDER, $4, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $b ; person object SPRITE_BOULDER, $5, $5, STAY, BOULDER_MOVEMENT_BYTE_2, $c ; person object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm index 4389a1a3..85f7459a 100755 --- a/data/mart_inventories.asm +++ b/data/mart_inventories.asm @@ -44,7 +44,7 @@ CeladonMart4Text1:: ; 248e (0:248e) ; Celadon Dept. Store 5F (1) CeladonMart5Text3:: ; 2496 (0:2496) - db $FE,7,X_ACCURACY,GUARD_SPEC_,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED + db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED db X_SPECIAL,$FF ; Celadon Dept. Store 5F (2) diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm index f6763d7d..8a8aecdb 100755 --- a/data/mon_palettes.asm +++ b/data/mon_palettes.asm @@ -82,7 +82,7 @@ MonsterPalettes: ; 725c8 (1c:65c8) db PAL_PINKMON ; SLOWBRO db PAL_GREYMON ; MAGNEMITE db PAL_GREYMON ; MAGNETON - db PAL_BROWNMON ; FARFETCH_D + db PAL_BROWNMON ; FARFETCHD db PAL_BROWNMON ; DODUO db PAL_BROWNMON ; DODRIO db PAL_BLUEMON ; SEEL diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm index 46a1717a..3bd6a15b 100755 --- a/data/pokedex_order.asm +++ b/data/pokedex_order.asm @@ -62,7 +62,7 @@ PokedexOrder: ; 41024 (10:5024) db 0 ; MISSINGNO. db 0 ; MISSINGNO. db 0 ; MISSINGNO. - db DEX_FARFETCH_D + db DEX_FARFETCHD db DEX_VENONAT db DEX_DRAGONITE db 0 ; MISSINGNO. diff --git a/data/trades.asm b/data/trades.asm index b761fecf..274b0297 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,25 +1,25 @@ TradeMons: ; 71b7b (1c:5b7b) ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total IF DEF(_YELLOW) - db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" - db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" - db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@" - db KANGASKHAN,MUK, 0,"STICKY@@@@@" - db MEW, MEW, 2,"BART@@@@@@@" - db TANGELA, PARASECT, 0,"SPIKE@@@@@@" - db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@" - db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@" - db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@" - db CUBONE, MACHOKE, 2,"RICKY@@@@@@" + db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" + db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" + db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@" + db KANGASKHAN,MUK, 0,"STICKY@@@@@" + db MEW, MEW, 2,"BART@@@@@@@" + db TANGELA, PARASECT, 0,"SPIKE@@@@@@" + db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@" + db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@" + db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@" + db CUBONE, MACHOKE, 2,"RICKY@@@@@@" ELSE - db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" - db ABRA, MR_MIME, 0,"MARCEL@@@@@" - db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" - db PONYTA, SEEL, 0,"SAILOR@@@@@" - db SPEAROW, FARFETCH_D,2,"DUX@@@@@@@@" - db SLOWBRO, LICKITUNG, 0,"MARC@@@@@@@" - db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@" - db RAICHU, ELECTRODE, 1,"DORIS@@@@@@" - db VENONAT, TANGELA, 2,"CRINKLES@@@" - db NIDORAN_M, NIDORAN_F, 2,"SPOT@@@@@@@" + db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" + db ABRA, MR_MIME, 0,"MARCEL@@@@@" + db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" + db PONYTA, SEEL, 0,"SAILOR@@@@@" + db SPEAROW, FARFETCHD,2,"DUX@@@@@@@@" + db SLOWBRO, LICKITUNG,0,"MARC@@@@@@@" + db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@" + db RAICHU, ELECTRODE,1,"DORIS@@@@@@" + db VENONAT, TANGELA, 2,"CRINKLES@@@" + db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@" ENDC diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm index 8fbb0069..518dab42 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -58,7 +58,7 @@ TeamMoves: db 2,4,BUBBLEBEAM db 0 - db LT__SURGE,$1 + db LT_SURGE,$1 db 1,1,THUNDERBOLT db 1,2,MEGA_PUNCH db 1,3,MEGA_KICK diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index b521fe95..321e565c 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -306,16 +306,16 @@ BirdKeeperData: db 29,PIDGEY,PIDGEOTTO,0 db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0 db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0 - db 33,FARFETCH_D,0 + db 33,FARFETCHD,0 db 29,SPEAROW,FEAROW,0 - db 26,PIDGEOTTO,FARFETCH_D,DODUO,PIDGEY,0 + db 26,PIDGEOTTO,FARFETCHD,DODUO,PIDGEY,0 db 28,DODRIO,DODUO,DODUO,0 db 29,SPEAROW,FEAROW,0 db 34,DODRIO,0 db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0 db 30,FEAROW,FEAROW,PIDGEOTTO,0 db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0 - db 42,FARFETCH_D,FEAROW,0 + db 42,FARFETCHD,FEAROW,0 db 28,PIDGEY,DODUO,PIDGEOTTO,0 db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0 db 29,PIDGEOTTO,FEAROW,0 diff --git a/data/trainer_types.asm b/data/trainer_types.asm index 659eb2ac..bc94015c 100755 --- a/data/trainer_types.asm +++ b/data/trainer_types.asm @@ -1,6 +1,6 @@ FemaleTrainerList:: ; 3434 (0:3434) db OPP_LASS - db OPP_JR__TRAINER_F + db OPP_JR_TRAINER_F db OPP_BEAUTY db OPP_COOLTRAINER_F db $FF diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index 7f5e47fe..9bb26a6d 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -38,8 +38,8 @@ Route12Mons: db 27,BELLSPROUT db 29,GLOOM db 29,WEEPINBELL - db 26,FARFETCH_D - db 31,FARFETCH_D + db 26,FARFETCHD + db 31,FARFETCHD db $03 db 15,SLOWPOKE diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm index 1b694f36..be8ce386 100755 --- a/data/wildPokemon/route13.asm +++ b/data/wildPokemon/route13.asm @@ -39,8 +39,8 @@ Route13Mons: db 27,BELLSPROUT db 29,GLOOM db 29,WEEPINBELL - db 26,FARFETCH_D - db 31,FARFETCH_D + db 26,FARFETCHD + db 31,FARFETCHD db $03 db 15,SLOWPOKE diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 2dc34e52..c5c3774f 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -903,7 +903,7 @@ FaintEnemyPokemon: ; 0x3c567 call SaveScreenTilesToBuffer1 xor a ld [wBattleResult], a - ld b, EXP__ALL + ld b, EXP_ALL call IsItemInBag push af jr z, .giveExpToMonsThatFought ; if no exp all, then jump diff --git a/engine/battle/moveEffects/pay_day_effect.asm b/engine/battle/moveEffects/pay_day_effect.asm index 26e69ef5..eb228615 100644 --- a/engine/battle/moveEffects/pay_day_effect.asm +++ b/engine/battle/moveEffects/pay_day_effect.asm @@ -1,4 +1,4 @@ -PayDayEffect_ ; 2feb8 (b:7eb8) +PayDayEffect_: ; 2feb8 (b:7eb8) xor a ld hl, wcd6d ld [hli], a diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 40a115b9..bab4c253 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -280,8 +280,8 @@ TrainerClassMoveChoiceModifications: ; 3989b (e:589b) db 1,0 ; BUG CATCHER db 1,0 ; LASS db 1,3,0 ; SAILOR - db 1,0 ; JR__TRAINER_M - db 1,0 ; JR__TRAINER_F + db 1,0 ; JR_TRAINER_M + db 1,0 ; JR_TRAINER_F db 1,2,3,0; POKEMANIAC db 1,2,0 ; SUPER_NERD db 1,0 ; HIKER @@ -311,7 +311,7 @@ TrainerClassMoveChoiceModifications: ; 3989b (e:589b) db 1,0 ; BRUNO db 1,0 ; BROCK db 1,3,0 ; MISTY - db 1,3,0 ; LT__SURGE + db 1,3,0 ; LT_SURGE db 1,3,0 ; ERIKA db 1,3,0 ; KOGA db 1,3,0 ; BLAINE @@ -742,7 +742,7 @@ AIUseGuardSpec: ; 3a7b5 (e:67b5) call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 1,[hl] - ld a,GUARD_SPEC_ + ld a,GUARD_SPEC jp AIPrintItemUse AIUseDireHit: ; 0x3a7c2 unused diff --git a/engine/items/items.asm b/engine/items/items.asm index 9e022ae8..55dcb53e 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -70,7 +70,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw ItemUseMedicine ; FULL_HEAL dw ItemUseMedicine ; REVIVE dw ItemUseMedicine ; MAX_REVIVE - dw ItemUseGuardSpec ; GUARD_SPEC_ + dw ItemUseGuardSpec ; GUARD_SPEC dw ItemUseSuperRepel ; SUPER_REPL dw ItemUseMaxRepel ; MAX_REPEL dw ItemUseDireHit ; DIRE_HIT @@ -78,7 +78,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw ItemUseMedicine ; FRESH_WATER dw ItemUseMedicine ; SODA_POP dw ItemUseMedicine ; LEMONADE - dw UnusableItem ; S_S__TICKET + dw UnusableItem ; S_S_TICKET dw UnusableItem ; GOLD_TEETH dw ItemUseXStat ; X_ATTACK dw ItemUseXStat ; X_DEFEND @@ -90,7 +90,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw UnusableItem ; SILPH_SCOPE dw ItemUsePokeflute ; POKE_FLUTE dw UnusableItem ; LIFT_KEY - dw UnusableItem ; EXP__ALL + dw UnusableItem ; EXP_ALL dw ItemUseOldRod ; OLD_ROD dw ItemUseGoodRod ; GOOD_ROD dw ItemUseSuperRod ; SUPER_ROD diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index d594f907..04d3ee60 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -163,7 +163,7 @@ BillsHouseText2: ; 1e874 (7:6874) jr nz, .asm_1e8a9 ld hl, BillThankYouText call PrintText - lb bc, S_S__TICKET, 1 + lb bc, S_S_TICKET, 1 call GiveItem jr nc, .BagFull ld hl, SSTicketReceivedText diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index 332df6b6..14e3bc5d 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -11,7 +11,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651) jr nz, .asm_49683 ld a, 50 ; pokemon needed ld [hOaksAideRequirement], a - ld a, EXP__ALL ; oak's aide reward + ld a, EXP_ALL ; oak's aide reward ld [hOaksAideRewardItem], a ld [wd11e], a call GetItemName diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index b60d4111..66df8021 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -52,7 +52,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) call DisplayTextID CheckEvent EVENT_SS_ANNE_LEFT jr nz, .asm_19810 - ld b, S_S__TICKET + ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a @@ -170,7 +170,7 @@ VermilionCityText3: ; 198b1 (6:58b1) .asm_198d0 ld hl, SSAnneWelcomeText9 call PrintText - ld b, S_S__TICKET + ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a -- cgit v1.3.1-sl0p From 1a5a108bdf6904423bfa80cc7bcb5582331740cb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 18 Dec 2015 19:14:42 -0800 Subject: Label elite four scripts more completely. --- scripts/agatha.asm | 35 +++++++++++++++--------------- scripts/bruno.asm | 35 +++++++++++++++--------------- scripts/gary.asm | 58 +++++++++++++++++++++++++------------------------- scripts/lance.asm | 45 +++++++++++++++++++++------------------ scripts/lorelei.asm | 35 ++++++++++++++++-------------- text/maps/champion.asm | 6 +++--- 6 files changed, 111 insertions(+), 103 deletions(-) diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 424a9af4..1216f53a 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -1,5 +1,5 @@ AgathaScript: ; 7642d (1d:642d) - call AgathaScript_76443 + call AgathaShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, AgathaTrainerHeaders ld de, AgathaScriptPointers @@ -8,24 +8,24 @@ AgathaScript: ; 7642d (1d:642d) ld [wAgathaCurScript], a ret -AgathaScript_76443: ; 76443 (1d:6443) +AgathaShowOrHideExitBlock: ; 76443 (1d:6443) +; Blocks or clears the exit to the next room. ld hl, wd126 bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 - jr z, .asm_76457 + jr z, .blockExitToNextRoom ld a, $e - jp AgathaScript_76459 -.asm_76457 + jp .setExitBlock +.blockExitToNextRoom ld a, $3b - -AgathaScript_76459: ; 76459 (1d:6459) +.setExitBlock: ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock -AgathaScript_76464: ; 76464 (1d:6464) +ResetAgathaScript: ; 76464 (1d:6464) xor a ld [wAgathaCurScript], a ret @@ -40,7 +40,8 @@ AgathaScriptPointers: ; 76469 (1d:6469) AgathaScript4: ; 76473 (1d:6473) ret -AgathaScript_76474: ; 76474 (1d:6474) +AgathaScriptWalkIntoRoom: ; 76474 (1d:6474) +; Walk six steps upward. ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -58,7 +59,7 @@ AgathaScript_76474: ; 76474 (1d:6474) ret AgathaScript0: ; 76490 (1d:6490) - ld hl, CoordsData_764d1 + ld hl, AgathaEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a @@ -67,14 +68,14 @@ AgathaScript0: ; 76490 (1d:6490) ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] - cp $3 - jr c, .asm_764b4 + cp $3 ; Is player standing one tile above the exit? + jr c, .stopPlayerFromLeaving CheckAndSetEvent EVENT_AUTOWALKED_INTO_AGATHAS_ROOM - jr z, AgathaScript_76474 -.asm_764b4 + jr z, AgathaScriptWalkIntoRoom +.stopPlayerFromLeaving ld a, $2 ld [hSpriteIndexOrTextID], a - call DisplayTextID + call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 @@ -85,7 +86,7 @@ AgathaScript0: ; 76490 (1d:6490) ld [wCurMapScript], a ret -CoordsData_764d1: ; 764d1 (1d:64d1) +AgathaEntranceCoords: ; 764d1 (1d:64d1) db $0A,$04 db $0A,$05 db $0B,$04 @@ -107,7 +108,7 @@ AgathaScript2: ; 764ed (1d:64ed) call EndTrainerBattle ld a, [wIsInBattle] cp $ff - jp z, AgathaScript_76464 + jp z, ResetAgathaScript ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 28671db5..2135e3de 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -1,5 +1,5 @@ BrunoScript: ; 762d6 (1d:62d6) - call BrunoScript_762ec + call BrunoShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, BrunoTrainerHeaders ld de, BrunoScriptPointers @@ -8,24 +8,24 @@ BrunoScript: ; 762d6 (1d:62d6) ld [wBrunoCurScript], a ret -BrunoScript_762ec: ; 762ec (1d:62ec) +BrunoShowOrHideExitBlock: ; 762ec (1d:62ec) +; Blocks or clears the exit to the next room. ld hl, wd126 bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 - jr z, .asm_76300 + jr z, .blockExitToNextRoom ld a, $5 - jp BrunoScript_76302 -.asm_76300 + jp .setExitBlock +.blockExitToNextRoom ld a, $24 - -BrunoScript_76302: ; 76302 (1d:6302) +.setExitBlock ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock -BrunoScript_7630d: ; 7630d (1d:630d) +ResetBrunoScript: ; 7630d (1d:630d) xor a ld [wBrunoCurScript], a ret @@ -40,7 +40,8 @@ BrunoScriptPointers: ; 76312 (1d:6312) BrunoScript4: ; 7631c (1d:631c) ret -BrunoScript_7631d: ; 7631d (1d:631d) +BrunoScriptWalkIntoRoom: ; 7631d (1d:631d) +; Walk six steps upward. ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -58,7 +59,7 @@ BrunoScript_7631d: ; 7631d (1d:631d) ret BrunoScript0: ; 76339 (1d:6339) - ld hl, CoordsData_7637a + ld hl, BrunoEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a @@ -67,14 +68,14 @@ BrunoScript0: ; 76339 (1d:6339) ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] - cp $3 - jr c, .asm_7635d + cp $3 ; Is player standing one tile above the exit? + jr c, .stopPlayerFromLeaving CheckAndSetEvent EVENT_AUTOWALKED_INTO_BRUNOS_ROOM - jr z, BrunoScript_7631d -.asm_7635d + jr z, BrunoScriptWalkIntoRoom +.stopPlayerFromLeaving ld a, $2 ld [hSpriteIndexOrTextID], a - call DisplayTextID + call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 @@ -85,7 +86,7 @@ BrunoScript0: ; 76339 (1d:6339) ld [wCurMapScript], a ret -CoordsData_7637a: ; 7637a (1d:637a) +BrunoEntranceCoords: ; 7637a (1d:637a) db $0A,$04 db $0A,$05 db $0B,$04 @@ -107,7 +108,7 @@ BrunoScript2: ; 76396 (1d:6396) call EndTrainerBattle ld a, [wIsInBattle] cp $ff - jp z, BrunoScript_7630d + jp z, ResetBrunoScript ld a, $1 ld [hSpriteIndexOrTextID], a jp DisplayTextID diff --git a/scripts/gary.asm b/scripts/gary.asm index 8db7544f..cd1f75a3 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -4,7 +4,7 @@ GaryScript: ; 75f1d (1d:5f1d) ld a, [wGaryCurScript] jp CallFunctionInTable -GaryScript_75f29: ; 75f29 (1d:5f29) +ResetGaryScript: ; 75f29 (1d:5f29) xor a ld [wJoyIgnore], a ld [wGaryCurScript], a @@ -30,7 +30,7 @@ GaryScript1: ; 75f48 (1d:5f48) ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement75f63 + ld de, GaryEntrance_RLEMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a @@ -39,7 +39,7 @@ GaryScript1: ; 75f48 (1d:5f48) ld [wGaryCurScript], a ret -RLEMovement75f63: ; 75f63 (1d:5f63) +GaryEntrance_RLEMovement: ; 75f63 (1d:5f63) db D_UP,1 db D_RIGHT,1 db D_UP,3 @@ -53,7 +53,7 @@ GaryScript2: ; 75f6a (1d:5f6a) xor a ld [wJoyIgnore], a ld hl, wOptions - res 7, [hl] + res 7, [hl] ; Turn on battle animations to make the battle feel more epic. ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -61,8 +61,8 @@ GaryScript2: ; 75f6a (1d:5f6a) ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, GaryText_760f9 - ld de, GaryText_760fe + ld hl, GaryDefeatedText + ld de, GaryVictoryText call SaveEndBattleTextPointers ld a, OPP_SONY3 ld [wCurOpponent], a @@ -70,17 +70,17 @@ GaryScript2: ; 75f6a (1d:5f6a) ; select which team to use during the encounter ld a, [wRivalStarter] cp STARTER2 - jr nz, .NotSquirtle + jr nz, .NotStarter2 ld a, $1 - jr .done -.NotSquirtle + jr .saveTrainerId +.NotStarter2 cp STARTER3 - jr nz, .Charmander + jr nz, .NotStarter3 ld a, $2 - jr .done -.Charmander + jr .saveTrainerId +.NotStarter3 ld a, $3 -.done +.saveTrainerId ld [wTrainerNo], a xor a @@ -92,7 +92,7 @@ GaryScript2: ; 75f6a (1d:5f6a) GaryScript3: ; 75fbb (1d:5fbb) ld a, [wIsInBattle] cp $ff - jp z, GaryScript_75f29 + jp z, ResetGaryScript call UpdateSprites SetEvent EVENT_BEAT_CHAMPION_RIVAL ld a, $f0 @@ -115,7 +115,7 @@ GaryScript4: ; 75fe4 (1d:5fe4) ld a, $2 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld de, MovementData_76014 + ld de, OakEntranceAfterVictoryMovement ld a, $2 ld [H_SPRITEINDEX], a call MoveSprite @@ -126,7 +126,7 @@ GaryScript4: ; 75fe4 (1d:5fe4) ld [wGaryCurScript], a ret -MovementData_76014: ; 76014 (1d:6014) +OakEntranceAfterVictoryMovement: ; 76014 (1d:6014) db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP @@ -179,7 +179,7 @@ GaryScript7: ; 7605f (1d:605f) ld a, $5 ld [hSpriteIndexOrTextID], a call GaryScript_760c8 - ld de, MovementData_76080 + ld de, OakExitGaryRoomMovement ld a, $2 ld [H_SPRITEINDEX], a call MoveSprite @@ -187,7 +187,7 @@ GaryScript7: ; 7605f (1d:605f) ld [wGaryCurScript], a ret -MovementData_76080: ; 76080 (1d:6080) +OakExitGaryRoomMovement: ; 76080 (1d:6080) db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db $FF @@ -207,7 +207,7 @@ GaryScript9: ; 76099 (1d:6099) ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement760b4 + ld de, WalkToHallOfFame_RLEMovment call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a @@ -216,7 +216,7 @@ GaryScript9: ; 76099 (1d:6099) ld [wGaryCurScript], a ret -RLEMovement760b4: ; 760b4 (1d:60b4) +WalkToHallOfFame_RLEMovment: ; 760b4 (1d:60b4) db D_UP,4 db D_LEFT,1 db $ff @@ -249,23 +249,23 @@ GaryTextPointers: ; 760d6 (1d:60d6) GaryText1: ; 760e0 (1d:60e0) TX_ASM CheckEvent EVENT_BEAT_CHAMPION_RIVAL - ld hl, GaryText_760f4 - jr z, .asm_17e9f + ld hl, GaryChampionIntroText + jr z, .printText ld hl, GaryText_76103 -.asm_17e9f +.printText call PrintText jp TextScriptEnd -GaryText_760f4: ; 760f4 (1d:60f4) - TX_FAR _GaryText_760f4 +GaryChampionIntroText: ; 760f4 (1d:60f4) + TX_FAR _GaryChampionIntroText db "@" -GaryText_760f9: ; 760f9 (1d:60f9) - TX_FAR _GaryText_760f9 +GaryDefeatedText: ; 760f9 (1d:60f9) + TX_FAR _GaryDefeatedText db "@" -GaryText_760fe: ; 760fe (1d:60fe) - TX_FAR _GaryText_760fe +GaryVictoryText: ; 760fe (1d:60fe) + TX_FAR _GaryVictoryText db "@" GaryText_76103: ; 76103 (1d:6103) diff --git a/scripts/lance.asm b/scripts/lance.asm index 97323c88..767edb8a 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -1,5 +1,5 @@ LanceScript: ; 5a2ae (16:62ae) - call LanceScript_5a2c4 + call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing ld hl, LanceTrainerHeaders ld de, LanceScriptPointers @@ -8,34 +8,36 @@ LanceScript: ; 5a2ae (16:62ae) ld [wLanceCurScript], a ret -LanceScript_5a2c4: ; 5a2c4 (16:62c4) +LanceShowOrHideEntranceBlocks: ; 5a2c4 (16:62c4) ld hl, wd126 bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_LANCES_ROOM_LOCK_DOOR - jr nz, .asm_5a2da + jr nz, .closeEntrance + ; open entrance ld a, $31 ld b, $32 - jp LanceScript_5a2de -.asm_5a2da + jp LanceSetEntranceBlocks +.closeEntrance ld a, $72 ld b, $73 -LanceScript_5a2de: ; 5a2de (16:62de) +LanceSetEntranceBlocks: ; 5a2de (16:62de) +; Replaces the tile blocks so the player can't leave. push bc ld [wNewTileBlockID], a lb bc, 6, 2 - call LanceScript_5a2f0 + call LanceSetEntranceBlock pop bc ld a, b ld [wNewTileBlockID], a lb bc, 6, 3 -LanceScript_5a2f0: ; 5a2f0 (16:62f0) +LanceSetEntranceBlock: ; 5a2f0 (16:62f0) predef_jump ReplaceTileBlock -LanceScript_5a2f5: ; 5a2f5 (16:62f5) +ResetLanceScript: ; 5a2f5 (16:62f5) xor a ld [wLanceCurScript], a ret @@ -53,29 +55,29 @@ LanceScript4: ; 5a304 (16:6304) LanceScript0: ; 5a305 (16:6305) CheckEvent EVENT_BEAT_LANCE ret nz - ld hl, CoordsData_5a33e + ld hl, LanceTriggerMovementCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a ld [hJoyHeld], a ld a, [wCoordIndex] - cp $3 - jr nc, .asm_5a325 + cp $3 ; Is player standing next to Lance's sprite? + jr nc, .notStandingNextToLance ld a, $1 ld [hSpriteIndexOrTextID], a jp DisplayTextID -.asm_5a325 - cp $5 - jr z, LanceScript_5a35b +.notStandingNextToLance + cp $5 ; Is player standing on the entrance staircase? + jr z, WalkToLance CheckAndSetEvent EVENT_LANCES_ROOM_LOCK_DOOR ret nz ld hl, wd126 set 5, [hl] ld a, SFX_GO_INSIDE call PlaySound - jp LanceScript_5a2c4 + jp LanceShowOrHideEntranceBlocks -CoordsData_5a33e: ; 5a33e (16:633e) +LanceTriggerMovementCoords: ; 5a33e (16:633e) db $01,$05 db $02,$06 db $0B,$05 @@ -87,16 +89,17 @@ LanceScript2: ; 5a349 (16:6349) call EndTrainerBattle ld a, [wIsInBattle] cp $ff - jp z, LanceScript_5a2f5 + jp z, ResetLanceScript ld a, $1 ld [hSpriteIndexOrTextID], a jp DisplayTextID -LanceScript_5a35b: ; 5a35b (16:635b) +WalkToLance: ; 5a35b (16:635b) +; Moves the player down the hallway to Lance's room. ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEList_5a379 + ld de, WalkToLance_RLEList call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a @@ -106,7 +109,7 @@ LanceScript_5a35b: ; 5a35b (16:635b) ld [wCurMapScript], a ret -RLEList_5a379: ; 5a379 (16:6379) +WalkToLance_RLEList: ; 5a379 (16:6379) db D_UP, $0C db D_LEFT, $0C db D_DOWN, $07 diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 6d67d489..1acbffec 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -1,5 +1,5 @@ LoreleiScript: ; 7617b (1d:617b) - call LoreleiScript_76191 + call LoreleiShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, LoreleiTrainerHeaders ld de, LoreleiScriptPointers @@ -8,7 +8,8 @@ LoreleiScript: ; 7617b (1d:617b) ld [wLoreleiCurScript], a ret -LoreleiScript_76191: ; 76191 (1d:6191) +LoreleiShowOrHideExitBlock: ; 76191 (1d:6191) +; Blocks or clears the exit to the next room. ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -16,17 +17,17 @@ LoreleiScript_76191: ; 76191 (1d:6191) ld hl, wBeatLorelei set 1, [hl] CheckEvent EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 - jr z, .asm_761a9 + jr z, .blockExitToNextRoom ld a, $5 - jr .asm_761ab -.asm_761a9 + jr .setExitBlock +.blockExitToNextRoom ld a, $24 -.asm_761ab +.setExitBlock ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock -LoreleiScript_761b6: ; 761b6 (1d:61b6) +ResetLoreleiScript: ; 761b6 (1d:61b6) xor a ld [wLoreleiCurScript], a ret @@ -41,7 +42,8 @@ LoreleiScriptPointers: ; 761bb (1d:61bb) LoreleiScript4: ; 761c5 (1d:61c5) ret -LoreleiScript_761c6: ; 761c6 (1d:61c6) +LoreleiScriptWalkIntoRoom: ; 761c6 (1d:61c6) +; Walk six steps upward. ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -59,7 +61,7 @@ LoreleiScript_761c6: ; 761c6 (1d:61c6) ret LoreleiScript0: ; 761e2 (1d:61e2) - ld hl, CoordsData_76223 + ld hl, LoreleiEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a @@ -68,14 +70,14 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] - cp $3 - jr c, .asm_76206 + cp $3 ; Is player standing one tile above the exit? + jr c, .stopPlayerFromLeaving CheckAndSetEvent EVENT_AUTOWALKED_INTO_LORELEIS_ROOM - jr z, LoreleiScript_761c6 -.asm_76206 + jr z, LoreleiScriptWalkIntoRoom +.stopPlayerFromLeaving ld a, $2 ld [hSpriteIndexOrTextID], a - call DisplayTextID + call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 @@ -86,7 +88,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [wCurMapScript], a ret -CoordsData_76223: ; 76223 (1d:6223) +LoreleiEntranceCoords: ; 76223 (1d:6223) db $0A,$04 db $0A,$05 db $0B,$04 @@ -103,11 +105,12 @@ LoreleiScript3: ; 7622c (1d:622c) ld [wLoreleiCurScript], a ld [wCurMapScript], a ret + LoreleiScript2: ; 7623f (1d:623f) call EndTrainerBattle ld a, [wIsInBattle] cp $ff - jp z, LoreleiScript_761b6 + jp z, ResetLoreleiScript ld a, $1 ld [hSpriteIndexOrTextID], a jp DisplayTextID diff --git a/text/maps/champion.asm b/text/maps/champion.asm index eb0287af..51258818 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -1,4 +1,4 @@ -_GaryText_760f4:: +_GaryChampionIntroText:: text $53, ": Hey!" para "I was looking" @@ -35,7 +35,7 @@ _GaryText_760f4:: cont "in the world!" done -_GaryText_760f9:: +_GaryDefeatedText:: text "NO!" line "That can't be!" cont "You beat my best!" @@ -49,7 +49,7 @@ _GaryText_760f9:: cont "It's not fair!" prompt -_GaryText_760fe:: +_GaryVictoryText:: text "Hahaha!" line "I won, I won!" -- cgit v1.3.1-sl0p From 28dc5686b05477e13a9cc078975315140bee9800 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 3 Jan 2016 14:17:10 -0500 Subject: Fix game time labels --- engine/hall_of_fame.asm | 4 ++-- engine/hidden_object_functions17.asm | 2 +- engine/hidden_object_functions7.asm | 2 +- engine/menu/main_menu.asm | 6 +++--- engine/menu/start_sub_menus.asm | 4 ++-- engine/overworld/card_key.asm | 2 +- engine/play_time.asm | 14 +++++++------- engine/predefs7.asm | 2 +- home.asm | 2 +- home/overworld.asm | 4 ++-- scripts/agatha.asm | 2 +- scripts/bruno.asm | 2 +- scripts/celadongamecorner.asm | 6 +++--- scripts/celadongym.asm | 2 +- scripts/celadonmartelevator.asm | 2 +- scripts/ceruleangym.asm | 2 +- scripts/cinnabargym.asm | 4 ++-- scripts/cinnabarisland.asm | 2 +- scripts/fuchsiagym.asm | 2 +- scripts/indigoplateaulobby.asm | 2 +- scripts/lance.asm | 4 ++-- scripts/lorelei.asm | 2 +- scripts/mansion1.asm | 4 ++-- scripts/mansion2.asm | 4 ++-- scripts/mansion3.asm | 2 +- scripts/mansion4.asm | 2 +- scripts/pewtergym.asm | 2 +- scripts/rockethideout1.asm | 2 +- scripts/rockethideout4.asm | 4 ++-- scripts/rockethideoutelevator.asm | 2 +- scripts/route23.asm | 2 +- scripts/route25.asm | 2 +- scripts/saffrongym.asm | 2 +- scripts/silphco10.asm | 2 +- scripts/silphco11.asm | 2 +- scripts/silphco2.asm | 2 +- scripts/silphco3.asm | 2 +- scripts/silphco4.asm | 2 +- scripts/silphco5.asm | 2 +- scripts/silphco6.asm | 2 +- scripts/silphco7.asm | 2 +- scripts/silphco8.asm | 2 +- scripts/silphco9.asm | 2 +- scripts/silphcoelevator.asm | 2 +- scripts/vermilioncity.asm | 2 +- scripts/vermiliongym.asm | 2 +- scripts/victoryroad1.asm | 4 ++-- scripts/victoryroad2.asm | 6 +++--- scripts/victoryroad3.asm | 4 ++-- wram.asm | 16 +++++++++------- 50 files changed, 80 insertions(+), 78 deletions(-) diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 73c4918b..4225c5a1 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -224,12 +224,12 @@ HoFDisplayPlayerStats: ; 70377 (1c:4377) ld de, HoFPlayTimeText call PlaceString coord hl, 5, 7 - ld de, wPlayTimeHours + 1 + ld de, wPlayTimeHours lb bc, 1, 3 call PrintNumber ld [hl], $6d inc hl - ld de, wPlayTimeMinutes + 1 + ld de, wPlayTimeMinutes lb bc, LEADING_ZEROES | 1, 2 call PrintNumber coord hl, 1, 9 diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 65a4669e..770b6b79 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -402,7 +402,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) .openSecondLock ; Completed the trash can puzzle. SetEvent EVENT_2ND_LOCK_OPENED - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 6, [hl] tx_pre_id VermilionGymTrashSuccesText3 diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index f123e89b..87305472 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -199,7 +199,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) ld a, [wCurrentMenuItem] cp c jr nz, .wrongAnswer - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, [hGymGateIndex] ld [$ffe0], a diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 7319ec17..75458c5e 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -90,7 +90,7 @@ MainMenu: ; 5af2 (1:5af2) jp .mainMenuLoop .choseContinue call DisplayContinueGameInfo - ld hl,wd126 + ld hl,wCurrentMapScriptFlags set 5,[hl] .inputLoop xor a @@ -411,12 +411,12 @@ PrintNumOwnedMons: ; 5e42 (1:5e42) jp PrintNumber PrintPlayTime: ; 5e55 (1:5e55) - ld de, wPlayTimeHours + 1 + ld de, wPlayTimeHours lb bc, 1, 3 call PrintNumber ld [hl], $6d inc hl - ld de, wPlayTimeMinutes + 1 + ld de, wPlayTimeMinutes lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index f7bb5a46..34c21da0 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -601,12 +601,12 @@ DrawTrainerInfo: ; 1349a (4:749a) ld c,$e3 call PrintBCDNumber coord hl, 9, 6 - ld de,wPlayTimeHours + 1 ; hours + ld de,wPlayTimeHours ; hours lb bc, LEFT_ALIGN | 1, 3 call PrintNumber ld [hl],$d6 ; colon tile ID inc hl - ld de,wPlayTimeMinutes + 1 ; minutes + ld de,wPlayTimeMinutes ; minutes lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index 2ef7529c..49d99575 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -49,7 +49,7 @@ PrintCardKeyText: ; 52673 (14:6673) .replaceCardKeyDoorTileBlock ld [wNewTileBlockID], a predef ReplaceTileBlock - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, SFX_GO_INSIDE jp PlaySound diff --git a/engine/play_time.asm b/engine/play_time.asm index 237883ed..79deaf5e 100755 --- a/engine/play_time.asm +++ b/engine/play_time.asm @@ -3,7 +3,7 @@ TrackPlayTime: ; 18dee (6:4dee) ld a, [wd732] bit 0, a ret z - ld a, [wPlayTimeMinutes] + ld a, [wPlayTimeMaxed] and a ret nz ld a, [wPlayTimeFrames] @@ -20,20 +20,20 @@ TrackPlayTime: ; 18dee (6:4dee) ret nz xor a ld [wPlayTimeSeconds], a - ld a, [wPlayTimeMinutes + 1] + ld a, [wPlayTimeMinutes] inc a - ld [wPlayTimeMinutes + 1], a + ld [wPlayTimeMinutes], a cp 60 ret nz xor a - ld [wPlayTimeMinutes + 1], a - ld a, [wPlayTimeHours + 1] + ld [wPlayTimeMinutes], a + ld a, [wPlayTimeHours] inc a - ld [wPlayTimeHours + 1], a + ld [wPlayTimeHours], a cp $ff ret nz ld a, $ff - ld [wPlayTimeMinutes], a + ld [wPlayTimeMaxed], a ret CountDownIgnoreInputBitReset: ; 18e36 (6:4e36) diff --git a/engine/predefs7.asm b/engine/predefs7.asm index a2c08171..c336eaa9 100755 --- a/engine/predefs7.asm +++ b/engine/predefs7.asm @@ -19,7 +19,7 @@ DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6) ld a, b ld [wListScrollOffset], a ret c - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 7, [hl] ld hl, wElevatorWarpMaps ld a, [wWhichPokemon] diff --git a/home.asm b/home.asm index 81a5fc8a..736e3a42 100644 --- a/home.asm +++ b/home.asm @@ -2379,7 +2379,7 @@ StartTrainerBattle:: ; 325d (0:325d) ret EndTrainerBattle:: ; 3275 (0:3275) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] ld hl, wd72d diff --git a/home/overworld.asm b/home/overworld.asm index 33d66dab..e4f58d4a 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -32,7 +32,7 @@ EnterMap:: ld hl, wd72d res 5, [hl] call UpdateSprites - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] xor a @@ -317,7 +317,7 @@ OverworldLoopLessDelay:: res 6,[hl] ld hl,wFlags_D733 res 3,[hl] - ld hl,wd126 + ld hl,wCurrentMapScriptFlags set 5,[hl] set 6,[hl] xor a diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 1216f53a..674bbcdc 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -10,7 +10,7 @@ AgathaScript: ; 7642d (1d:642d) AgathaShowOrHideExitBlock: ; 76443 (1d:6443) ; Blocks or clears the exit to the next room. - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 2135e3de..82551af6 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -10,7 +10,7 @@ BrunoScript: ; 762d6 (1d:62d6) BrunoShowOrHideExitBlock: ; 762ec (1d:62ec) ; Blocks or clears the exit to the next room. - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index dd534dba..9a6dcd6d 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -7,7 +7,7 @@ CeladonGameCornerScript: ; 48bbd (12:4bbd) jp CallFunctionInTable CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z @@ -24,7 +24,7 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) ret CeladonGameCornerScript_48bec: ; 48bec (12:4bec) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -109,7 +109,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69) ld a, HS_GAME_CORNER_ROCKET ld [wMissableObjectIndex], a predef HideObject - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] ld a, $0 diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index d774ea95..a9c017d0 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -1,5 +1,5 @@ CeladonGymScript: ; 4890a (12:490a) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeladonGymScript_48927 diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index 6d901613..e693d9fe 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -1,5 +1,5 @@ CeladonMartElevatorScript: ; 48600 (12:4600) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index 6bdbc298..4b1514b8 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -1,5 +1,5 @@ CeruleanGymScript: ; 5c6b3 (17:46b3) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeruleanGymScript_5c6d0 diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 6b347652..c4905d59 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -6,7 +6,7 @@ CinnabarGymScript: ; 7574a (1d:574a) jp CallFunctionInTable CinnabarGymScript_75759: ; 75759 (1d:5759) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] push hl @@ -165,7 +165,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) ; deactivate gym trainers SetEventRange EVENT_BEAT_CINNABAR_GYM_TRAINER_0, EVENT_BEAT_CINNABAR_GYM_TRAINER_6 - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] jp CinnabarGymScript_75792 diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index 7f8616b1..ce28fa1e 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -1,6 +1,6 @@ CinnabarIslandScript: ; 1ca19 (7:4a19) call EnableAutoTextBoxDrawing - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ResetEvent EVENT_MANSION_SWITCH_ON ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 2788a70a..54c3ae1a 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -9,7 +9,7 @@ FuchsiaGymScript: ; 7543d (1d:543d) ret FuchsiaGymScript_75453: ; 75453 (1d:5453) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index 7655d8c7..e524ed62 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -1,7 +1,7 @@ IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z diff --git a/scripts/lance.asm b/scripts/lance.asm index 767edb8a..c7d21d43 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -9,7 +9,7 @@ LanceScript: ; 5a2ae (16:62ae) ret LanceShowOrHideEntranceBlocks: ; 5a2c4 (16:62c4) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -71,7 +71,7 @@ LanceScript0: ; 5a305 (16:6305) jr z, WalkToLance CheckAndSetEvent EVENT_LANCES_ROOM_LOCK_DOOR ret nz - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, SFX_GO_INSIDE call PlaySound diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 1acbffec..12784964 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -10,7 +10,7 @@ LoreleiScript: ; 7617b (1d:617b) LoreleiShowOrHideExitBlock: ; 76191 (1d:6191) ; Blocks or clears the exit to the next room. - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index 2b14176d..d342c295 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -9,7 +9,7 @@ Mansion1Script: ; 442af (11:42af) ret Mansion1Subscript1: ; 442c5 (11:42c5) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -106,7 +106,7 @@ Mansion1Text4: ; 4435a (11:435a) jr nz, .asm_4438c ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld hl, MansionSwitchPressedText call PrintText diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 5e94fdfc..7fe09e4b 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -9,7 +9,7 @@ Mansion2Script: ; 51fd8 (14:5fd8) ret Mansion2Script_51fee: ; 51fee (14:5fee) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -112,7 +112,7 @@ Mansion2Text5: ; 52087 (14:6087) jr nz, .asm_520b9 ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld hl, Mansion2Text_520c7 call PrintText diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index e3b9993d..049bfeef 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -9,7 +9,7 @@ Mansion3Script: ; 521ee (14:61ee) ret Mansion3Script_52204: ; 52204 (14:6204) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index 5d1498bd..c506a407 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -9,7 +9,7 @@ Mansion4Script: ; 523b9 (14:63b9) ret Mansion4Script_523cf: ; 523cf (14:63cf) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 58a74cd2..52e28cb8 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -1,5 +1,5 @@ PewterGymScript: ; 5c387 (17:4387) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, PewterGymScript_5c3a4 diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 7802c89f..d821434d 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -9,7 +9,7 @@ RocketHideout1Script: ; 44bca (11:4bca) ret RocketHideout1Script_44be0: ; 44be0 (11:4be0) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 23b8c791..44ae7814 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -9,7 +9,7 @@ RocketHideout4Script: ; 4545d (11:545d) ret RocketHideout4Script_45473: ; 45473 (11:5473) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -65,7 +65,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6) call GBFadeInFromBlack xor a ld [wJoyIgnore], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, $0 ld [wRocketHideout4CurScript], a diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index 8a0ca049..c90b0aad 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -1,5 +1,5 @@ RocketHideoutElevatorScript: ; 45710 (11:5710) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl diff --git a/scripts/route23.asm b/scripts/route23.asm index 10bae669..ca72c9fe 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -6,7 +6,7 @@ Route23Script: ; 511da (14:51da) jp CallFunctionInTable Route23Script_511e9: ; 511e9 (14:51e9) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z diff --git a/scripts/route25.asm b/scripts/route25.asm index 4df7fd40..15b52b81 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -9,7 +9,7 @@ Route25Script: ; 515cb (14:55cb) ret Route25Script_515e1: ; 515e1 (14:55e1) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 54aea876..aae06103 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -1,5 +1,5 @@ SaffronGymScript: ; 5d00d (17:500d) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, .extra diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index 5ca16e04..e254765d 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -9,7 +9,7 @@ SilphCo10Script: ; 5a139 (16:6139) ret SilphCo10Script_5a14f: ; 5a14f (16:614f) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 79a2c328..10a74853 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -9,7 +9,7 @@ SilphCo11Script: ; 620fa (18:60fa) ret SilphCo11Script_62110: ; 62110 (18:6110) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index 7fbd81c8..42a5f3c0 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -9,7 +9,7 @@ SilphCo2Script: ; 59cf1 (16:5cf1) ret SilphCo2Script_59d07: ; 59d07 (16:5d07) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index 119d7c66..68ae7ed2 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -9,7 +9,7 @@ SilphCo3Script: ; 59f5b (16:5f5b) ret SilphCo3Script_59f71: ; 59f71 (16:5f71) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 38de73a7..12e04f69 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -9,7 +9,7 @@ SilphCo4Script: ; 19d0b (6:5d0b) ret SilphCo4Script_19d21: ; 19d21 (6:5d21) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 080ed963..d09848ba 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -9,7 +9,7 @@ SilphCo5Script: ; 19f37 (6:5f37) ret SilphCo5Script_19f4d: ; 19f4d (6:5f4d) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index 6d7978b2..406bc373 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -9,7 +9,7 @@ SilphCo6Script: ; 1a1a9 (6:61a9) ret SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index f771f865..e5d610fb 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -9,7 +9,7 @@ SilphCo7Script: ; 51b61 (14:5b61) ret SilphCo7Script_51b77: ; 51b77 (14:5b77) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index bb3217ec..86f02b60 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -9,7 +9,7 @@ SilphCo8Script: ; 56504 (15:6504) ret SilphCo8Script_5651a: ; 5651a (15:651a) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 2ab7423b..589a086e 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -9,7 +9,7 @@ SilphCo9Script: ; 5d7bb (17:57bb) ret SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index d080cfef..386cd2e8 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -1,5 +1,5 @@ SilphCoElevatorScript: ; 457c0 (11:57c0) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 66df8021..d1516b6a 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -1,6 +1,6 @@ VermilionCityScript: ; 197a1 (6:57a1) call EnableAutoTextBoxDrawing - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] push hl diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 15791f0e..cd2b5b3c 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -1,5 +1,5 @@ VermilionGymScript: ; 5ca26 (17:4a26) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index e66cc375..af0c3c3e 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -1,5 +1,5 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] call nz, .next @@ -29,7 +29,7 @@ VictoryRoad1Script0: ; 5da40 (17:5a40) ld hl, CoordsData_5da5c call CheckBoulderCoords jp nc, CheckFightingMapTrainers - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH ret diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 6fc4747c..c1fc6dc7 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -1,9 +1,9 @@ VictoryRoad2Script: ; 5179d (14:579d) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, VictoryRoad2Script_517c4 - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] call nz, VictoryRoad2Script_517c9 @@ -59,7 +59,7 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ret nz .asm_51810 - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ret diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 40117398..4cdf3fb0 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -9,7 +9,7 @@ VictoryRoad3Script: ; 44980 (11:4980) ret VictoryRoad3Script_44996: ; 44996 (11:4996) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -36,7 +36,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld a, [wCoordIndex] cp $1 jr nz, .asm_449dc - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] SetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 ret diff --git a/wram.asm b/wram.asm index 2610e59f..1bc8968d 100755 --- a/wram.asm +++ b/wram.asm @@ -2118,7 +2118,7 @@ wIsKeyItem:: ; d124 wTextBoxID:: ; d125 ds 1 -wd126:: ds 1 ; not exactly sure what this is used for, but it seems to be used as a multipurpose temp flag value +wCurrentMapScriptFlags:: ds 1 ; not exactly sure what this is used for, but it seems to be used as a multipurpose temp flag value wCurEnemyLVL:: ; d127 ds 1 @@ -2308,7 +2308,7 @@ wOptions:: ; d355 ds 1 wObtainedBadges:: ; d356 - ds 1 + flag_array 8 ds 1 @@ -3107,12 +3107,14 @@ wCurMapScript:: ; da39 ; mostly copied from map-specific map script pointer and wirtten back later ds 1 - ds 6 + ds 7 -wPlayTimeHours:: ; da40 - ds 2 -wPlayTimeMinutes:: ; da42 - ds 2 +wPlayTimeHours:: ; da41 + ds 1 +wPlayTimeMaxed:: ; da42 + ds 1 +wPlayTimeMinutes:: ; da43 + ds 1 wPlayTimeSeconds:: ; da44 ds 1 wPlayTimeFrames:: ; da45 -- cgit v1.3.1-sl0p From cd3eb9867be3cdaee4c1ac41c83e81a18ea5eff3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 5 Jan 2016 16:32:25 -0500 Subject: Fix a typo --- engine/hidden_object_functions17.asm | 6 +++--- text.asm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 770b6b79..90129a7a 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -280,7 +280,7 @@ StatusAilmentText2: ; 5ddbb (17:5dbb) ViridianBlackboardStatusPointers: ; 5ddcc (17:5ddc) dw ViridianBlackboardSleepText dw ViridianBlackboardPoisonText - dw ViridianBlackbaordPrlzText + dw ViridianBlackboardPrlzText dw ViridianBlackboardBurnText dw ViridianBlackboardFrozenText @@ -292,8 +292,8 @@ ViridianBlackboardPoisonText: ; 5dddb (17:5ddb) TX_FAR _ViridianBlackboardPoisonText db "@" -ViridianBlackbaordPrlzText: ; 5dde0 (17:5de0) - TX_FAR _ViridianBlackbaordPrlzText +ViridianBlackboardPrlzText: ; 5dde0 (17:5de0) + TX_FAR _ViridianBlackboardPrlzText db "@" ViridianBlackboardBurnText: ; 5dde5 (17:5de5) diff --git a/text.asm b/text.asm index f5b4b903..1e06c202 100644 --- a/text.asm +++ b/text.asm @@ -905,7 +905,7 @@ _ViridianBlackboardPoisonText:: line "to cure poison!" prompt -_ViridianBlackbaordPrlzText:: +_ViridianBlackboardPrlzText:: text "Paralysis could" line "make #MON" cont "moves misfire!" -- cgit v1.3.1-sl0p From 8a5a7d8e68538b727e0c166488265f395603366e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 9 Jan 2016 03:03:55 -0800 Subject: fix typoes --- data/hidden_objects.asm | 2 +- engine/hidden_object_functions17.asm | 18 +++++++++--------- home.asm | 6 +++--- text.asm | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 8170cf5a..d7851779 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -195,7 +195,7 @@ RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a) db $01,$00,$04 dbw BANK(OpenRedsPC), OpenRedsPC db $05,$03,$d0 - dbw BANK(PrintRedsNESText), PrintRedsNESText + dbw BANK(PrintRedSNESText), PrintRedSNESText db $FF BluesHouseHiddenObjects: ; 46b67 (11:6b67) db $01,$00,$04 diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 90129a7a..ffcc33c3 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -1,4 +1,4 @@ -PrintRedsNESText: ; 5db79 (17:5b79) +PrintRedSNESText: ; 5db79 (17:5b79) call EnableAutoTextBoxDrawing tx_pre_jump RedBedroomSNESText @@ -379,7 +379,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) and $f ld [wSecondLockTrashCanIndex], a - tx_pre_id VermilionGymTrashSuccesText1 + tx_pre_id VermilionGymTrashSuccessText1 jr .done .trySecondLock @@ -405,7 +405,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) ld hl, wCurrentMapScriptFlags set 6, [hl] - tx_pre_id VermilionGymTrashSuccesText3 + tx_pre_id VermilionGymTrashSuccessText3 .done jp PrintPredefTextID @@ -434,8 +434,8 @@ GymTrashCans: ; 5de7d (17:5e7d) db 2, 11, 13, 0, 0 ; 14 ; 5dec8 -VermilionGymTrashSuccesText1: ; 5dec8 (17:5ec8) - TX_FAR _VermilionGymTrashSuccesText1 +VermilionGymTrashSuccessText1: ; 5dec8 (17:5ec8) + TX_FAR _VermilionGymTrashSuccessText1 TX_ASM call WaitForSoundToFinish ld a, SFX_SWITCH @@ -444,8 +444,8 @@ VermilionGymTrashSuccesText1: ; 5dec8 (17:5ec8) jp TextScriptEnd ; unused -VermilionGymTrashSuccesText2: ; 5dedb (17:5edb) - TX_FAR _VermilionGymTrashSuccesText2 +VermilionGymTrashSuccessText2: ; 5dedb (17:5edb) + TX_FAR _VermilionGymTrashSuccessText2 db "@" ; unused @@ -457,8 +457,8 @@ VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0) call WaitForSoundToFinish jp TextScriptEnd -VermilionGymTrashSuccesText3: ; 5deef (17:5eef) - TX_FAR _VermilionGymTrashSuccesText3 +VermilionGymTrashSuccessText3: ; 5deef (17:5eef) + TX_FAR _VermilionGymTrashSuccessText3 TX_ASM call WaitForSoundToFinish ld a, SFX_GO_INSIDE diff --git a/home.asm b/home.asm index 736e3a42..2090e599 100644 --- a/home.asm +++ b/home.asm @@ -4714,9 +4714,9 @@ TextPredefs:: add_tx_pre FightingDojoText_52a1d ; 38 add_tx_pre NewBicycleText ; 39 add_tx_pre IndigoPlateauStatues ; 3A - add_tx_pre VermilionGymTrashSuccesText1 ; 3B - add_tx_pre VermilionGymTrashSuccesText2 ; 3C XXX unused - add_tx_pre VermilionGymTrashSuccesText3 ; 3D + add_tx_pre VermilionGymTrashSuccessText1 ; 3B + add_tx_pre VermilionGymTrashSuccessText2 ; 3C XXX unused + add_tx_pre VermilionGymTrashSuccessText3 ; 3D add_tx_pre VermilionGymTrashFailText ; 3E add_tx_pre TownMapText ; 3F add_tx_pre BookOrSculptureText ; 40 diff --git a/text.asm b/text.asm index 1e06c202..6555c185 100644 --- a/text.asm +++ b/text.asm @@ -948,7 +948,7 @@ _VermilionGymTrashText:: line "only trash here." done -_VermilionGymTrashSuccesText1:: +_VermilionGymTrashSuccessText1:: text "Hey! There's a" line "switch under the" cont "trash!" @@ -957,14 +957,14 @@ _VermilionGymTrashSuccesText1:: para "The 1st electric" line "lock opened!@@" -_VermilionGymTrashSuccesText2:: +_VermilionGymTrashSuccessText2:: text "Hey! There's" line "another switch" cont "under the trash!" cont "Turn it on!" prompt -_VermilionGymTrashSuccesText3:: +_VermilionGymTrashSuccessText3:: text "The 2nd electric" line "lock opened!" -- cgit v1.3.1-sl0p From 32a464b0f0e71ced1e1e6641407012b6f6ee0d55 Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 27 Jan 2016 23:08:50 -0600 Subject: Fix logically incorrect label --- engine/hidden_object_functions7.asm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 87305472..7ab0637b 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -22,9 +22,10 @@ DisplayOakLabRightPoster: ; 1e965 (7:6965) ld a, [wNumSetBits] cp 2 tx_pre_id SaveOptionText - jr c, .ownThreeOrMoreMon + jr c, .ownLessThanTwo + ; own two or more mon tx_pre_id StrengthsAndWeaknessesText -.ownThreeOrMoreMon +.ownLessThanTwo jp PrintPredefTextID SaveOptionText: ; 1e97e (7:697e) -- cgit v1.3.1-sl0p From 1980a5befc36eecc892daa7264de9d48c714b19e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Jan 2016 11:20:47 -0500 Subject: Macrofy sprite status data in WRA0 --- data/hidden_item_coords.asm | 2 +- data/trainer_parties.asm | 4 +++ engine/overworld/movement.asm | 6 ++-- macros.asm | 5 ++++ roms.md5 | 4 +-- scripts/blueshouse.asm | 32 +++++++++++--------- text/maps/vermilion_dock.asm | 3 +- wram.asm | 69 +++++++++++++++++++++++++++++++++++++++++-- 8 files changed, 102 insertions(+), 23 deletions(-) diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm index 54c785f5..b2f9b3cc 100755 --- a/data/hidden_item_coords.asm +++ b/data/hidden_item_coords.asm @@ -34,7 +34,7 @@ HiddenItemCoords: ; 766b8 (1d:66b8) db ROUTE_23,$5a,$08 db VICTORY_ROAD_2,$02,$05 db VICTORY_ROAD_2,$07,$1a - db $6f,$0b,$0e + db UNUSED_MAP_6F,$0b,$0e db VIRIDIAN_CITY,$04,$0e db ROUTE_11,$05,$30 db ROUTE_12,$3f,$02 diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index 321e565c..9bc80da1 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -57,6 +57,7 @@ TrainerDataPointers: ; 39d3b (e:5d3b) ; null-terminated YoungsterData: +; Route 3 db 11,RATTATA,EKANS,0 db 14,SPEAROW,0 db 10,RATTATA,RATTATA,ZUBAT,0 @@ -71,9 +72,11 @@ YoungsterData: db 18,NIDORAN_M,NIDORINO,0 db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 BugCatcherData: +; Viridian Forest db 6,WEEDLE,CATERPIE,0 db 7,WEEDLE,KAKUNA,WEEDLE,0 db 9,WEEDLE,0 +; Route 3 db 10,CATERPIE,WEEDLE,CATERPIE,0 db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0 db 11,CATERPIE,METAPOD,0 @@ -86,6 +89,7 @@ BugCatcherData: db 19,BEEDRILL,BEEDRILL,0 db 20,CATERPIE,WEEDLE,VENONAT,0 LassData: +; Route 3 db 9,PIDGEY,PIDGEY,0 db 10,RATTATA,NIDORAN_M,0 db 14,JIGGLYPUFF,0 diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index c89406d1..2af2e518 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -95,7 +95,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31) jr nz, .next2 ld a, $80 .next2 - ld [wSpriteStateData2 + $07], a + ld [wSpriteStateData2 + 7], a ret UnusedReadSpriteDataFunction: ; 4ec7 (1:4ec7) @@ -169,7 +169,7 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) call LoadDEPlusA ; a = [wNPCMovementDirections + movement byte 1] cp $e0 jp z, ChangeFacingDirection - cp $ff + cp STAY jr nz, .next ; reached end of wNPCMovementDirections list ld [hl], a ; store $ff in movement byte 1, disabling scripted movement @@ -180,7 +180,7 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) ld [wWastedByteCD3A], a ret .next - cp $fe + cp WALK jr nz, .determineDirection ; current NPC movement data is $fe. this seems buggy ld [hl], $1 ; set movement byte 1 to $1 diff --git a/macros.asm b/macros.asm index 9efb69e5..6162653d 100644 --- a/macros.asm +++ b/macros.asm @@ -252,6 +252,11 @@ tx_pre_jump: MACRO jp PrintPredefTextID ENDM +sound0x0A: macro + db $11 +endm + + WALK EQU $FE STAY EQU $FF diff --git a/roms.md5 b/roms.md5 index c4128cfd..9b4b336b 100644 --- a/roms.md5 +++ b/roms.md5 @@ -1,2 +1,2 @@ -3d45c1ee9abd5738df46d2bdda8b57dc pokered.gbc -50927e843568814f7ed45ec4f944bd8b pokeblue.gbc +3d45c1ee9abd5738df46d2bdda8b57dc pokered.gb +50927e843568814f7ed45ec4f944bd8b pokeblue.gb diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index eadcd388..806fbcab 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -1,7 +1,7 @@ BluesHouseScript: ; 19b3b (6:5b3b) call EnableAutoTextBoxDrawing - ld hl,BluesHouseScriptPointers - ld a,[wBluesHouseCurScript] + ld hl, BluesHouseScriptPointers + ld a, [wBluesHouseCurScript] jp CallFunctionInTable BluesHouseScriptPointers: ; 19b47 (6:5b47) @@ -12,8 +12,8 @@ BluesHouseScript0: ; 19b4b (6:5b4b) SetEvent EVENT_ENTERED_BLUES_HOUSE ; trigger the next script - ld a,1 - ld [wBluesHouseCurScript],a + ld a, 1 + ld [wBluesHouseCurScript], a ret BluesHouseScript1: ; 19b56 (6:5b56) @@ -27,31 +27,34 @@ BluesHouseTextPointers: ; 19b57 (6:5b57) BluesHouseText1: ; 19b5d (6:5b5d) TX_ASM CheckEvent EVENT_GOT_TOWN_MAP - jr nz,.GotMap + jr nz, .GotMap CheckEvent EVENT_GOT_POKEDEX - jr nz,.GiveMap - ld hl,DaisyInitialText + jr nz, .GiveMap + ld hl, DaisyInitialText call PrintText jr .done + .GiveMap - ld hl,DaisyOfferMapText + ld hl, DaisyOfferMapText call PrintText lb bc, TOWN_MAP, 1 call GiveItem jr nc, .BagFull - ld a,HS_TOWN_MAP - ld [wMissableObjectIndex],a + ld a, HS_TOWN_MAP + ld [wMissableObjectIndex], a predef HideObject ; hide table map object - ld hl,GotMapText + ld hl, GotMapText call PrintText SetEvent EVENT_GOT_TOWN_MAP jr .done + .GotMap - ld hl,DaisyUseMapText + ld hl, DaisyUseMapText call PrintText jr .done + .BagFull - ld hl,DaisyBagFullText + ld hl, DaisyBagFullText call PrintText .done jp TextScriptEnd @@ -66,7 +69,8 @@ DaisyOfferMapText: ; 19baf (6:5baf) GotMapText: ; 19bb4 (6:5bb4) TX_FAR _GotMapText - db $11,"@" + sound0x0A + db "@" DaisyBagFullText: ; 19bba (6:5bba) TX_FAR _DaisyBagFullText diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm index 26c556a7..28b75731 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/vermilion_dock.asm @@ -1,3 +1,4 @@ _VermilionDockText1:: - db $0, $57 + text "" + done diff --git a/wram.asm b/wram.asm index 1bc8968d..644617fd 100755 --- a/wram.asm +++ b/wram.asm @@ -228,7 +228,39 @@ wSpriteStateData1:: ; c100 ; C1xD ; C1xE ; C1xF - ds $10 * $10 +spritestatedata1: MACRO +\1SpriteStateData1:: +\1PictureID:: db +\1MovementStatus:: db +\1SpriteImageIdx:: db +\1YStepVector:: db +\1YPixels:: db +\1XStepVector:: db +\1XPixels:: db +\1IntraAnimFrameCounter:: db +\1AnimFrameCounter:: db +\1FacingDirection:: db + ds 6 +\1SpriteStateData1End:: +endm + + spritestatedata1 Player + spritestatedata1 Sprite01 + spritestatedata1 Sprite02 + spritestatedata1 Sprite03 + spritestatedata1 Sprite04 + spritestatedata1 Sprite05 + spritestatedata1 Sprite06 + spritestatedata1 Sprite07 + spritestatedata1 Sprite08 + spritestatedata1 Sprite09 + spritestatedata1 Sprite10 + spritestatedata1 Sprite11 + spritestatedata1 Sprite12 + spritestatedata1 Sprite13 + spritestatedata1 Sprite14 + spritestatedata1 Sprite15 + ; ds $10 * $10 ;SECTION "Sprite State Data 2", WRAM0[$c200] @@ -253,7 +285,40 @@ wSpriteStateData2:: ; c200 ; C2xD ; C2xE: sprite image base offset (in video ram, player always has value 1, used to compute c1x2) ; C2xF - ds $10 * $10 +spritestatedata2: MACRO +\1SpriteStateData2:: +\1WalkAnimationCounter:: db + ds 1 +\1YDisplacement:: db +\1XDisplacement:: db +\1MapY:: db +\1MapX:: db +\1MovementByte1:: db +\1GrassPriority:: db +\1MovementDelay:: db + ds 5 +\1SpriteImageBaseOffset:: db + ds 1 +\1SpriteStateData2End:: +endm + + spritestatedata2 Player + spritestatedata2 Sprite01 + spritestatedata2 Sprite02 + spritestatedata2 Sprite03 + spritestatedata2 Sprite04 + spritestatedata2 Sprite05 + spritestatedata2 Sprite06 + spritestatedata2 Sprite07 + spritestatedata2 Sprite08 + spritestatedata2 Sprite09 + spritestatedata2 Sprite10 + spritestatedata2 Sprite11 + spritestatedata2 Sprite12 + spritestatedata2 Sprite13 + spritestatedata2 Sprite14 + spritestatedata2 Sprite15 + ; ds $10 * $10 wSpriteDataEnd:: -- cgit v1.3.1-sl0p From 360a2200b17fbd7d19bc1fa5fa8eeb5641ff28ed Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Sat, 30 Jan 2016 20:40:12 -0700 Subject: Remove misleading (unreferenced) labels. --- data/baseStats/abra.asm | 1 - data/baseStats/aerodactyl.asm | 1 - data/baseStats/alakazam.asm | 1 - data/baseStats/arbok.asm | 1 - data/baseStats/arcanine.asm | 1 - data/baseStats/articuno.asm | 1 - data/baseStats/beedrill.asm | 1 - data/baseStats/bellsprout.asm | 1 - data/baseStats/blastoise.asm | 1 - data/baseStats/bulbasaur.asm | 3 ++- data/baseStats/butterfree.asm | 1 - data/baseStats/caterpie.asm | 1 - data/baseStats/chansey.asm | 1 - data/baseStats/charizard.asm | 1 - data/baseStats/charmander.asm | 1 - data/baseStats/charmeleon.asm | 1 - data/baseStats/clefable.asm | 1 - data/baseStats/clefairy.asm | 1 - data/baseStats/cloyster.asm | 1 - data/baseStats/cubone.asm | 1 - data/baseStats/dewgong.asm | 1 - data/baseStats/diglett.asm | 1 - data/baseStats/ditto.asm | 1 - data/baseStats/dodrio.asm | 1 - data/baseStats/doduo.asm | 1 - data/baseStats/dragonair.asm | 1 - data/baseStats/dragonite.asm | 1 - data/baseStats/dratini.asm | 1 - data/baseStats/drowzee.asm | 1 - data/baseStats/dugtrio.asm | 1 - data/baseStats/eevee.asm | 1 - data/baseStats/ekans.asm | 1 - data/baseStats/electabuzz.asm | 1 - data/baseStats/electrode.asm | 1 - data/baseStats/exeggcute.asm | 1 - data/baseStats/exeggutor.asm | 1 - data/baseStats/farfetchd.asm | 1 - data/baseStats/fearow.asm | 1 - data/baseStats/flareon.asm | 1 - data/baseStats/gastly.asm | 1 - data/baseStats/gengar.asm | 1 - data/baseStats/geodude.asm | 1 - data/baseStats/gloom.asm | 1 - data/baseStats/golbat.asm | 1 - data/baseStats/goldeen.asm | 1 - data/baseStats/golduck.asm | 1 - data/baseStats/golem.asm | 1 - data/baseStats/graveler.asm | 1 - data/baseStats/grimer.asm | 1 - data/baseStats/growlithe.asm | 1 - data/baseStats/gyarados.asm | 1 - data/baseStats/haunter.asm | 1 - data/baseStats/hitmonchan.asm | 1 - data/baseStats/hitmonlee.asm | 1 - data/baseStats/horsea.asm | 1 - data/baseStats/hypno.asm | 1 - data/baseStats/ivysaur.asm | 1 - data/baseStats/jigglypuff.asm | 1 - data/baseStats/jolteon.asm | 1 - data/baseStats/jynx.asm | 1 - data/baseStats/kabuto.asm | 1 - data/baseStats/kabutops.asm | 1 - data/baseStats/kadabra.asm | 1 - data/baseStats/kakuna.asm | 1 - data/baseStats/kangaskhan.asm | 1 - data/baseStats/kingler.asm | 1 - data/baseStats/koffing.asm | 1 - data/baseStats/krabby.asm | 1 - data/baseStats/lapras.asm | 1 - data/baseStats/lickitung.asm | 1 - data/baseStats/machamp.asm | 1 - data/baseStats/machoke.asm | 1 - data/baseStats/machop.asm | 1 - data/baseStats/magikarp.asm | 1 - data/baseStats/magmar.asm | 1 - data/baseStats/magnemite.asm | 1 - data/baseStats/magneton.asm | 1 - data/baseStats/mankey.asm | 1 - data/baseStats/marowak.asm | 1 - data/baseStats/meowth.asm | 1 - data/baseStats/metapod.asm | 1 - data/baseStats/mew.asm | 2 +- data/baseStats/mewtwo.asm | 1 - data/baseStats/moltres.asm | 1 - data/baseStats/mrmime.asm | 1 - data/baseStats/muk.asm | 1 - data/baseStats/nidoking.asm | 1 - data/baseStats/nidoqueen.asm | 1 - data/baseStats/nidoranf.asm | 1 - data/baseStats/nidoranm.asm | 1 - data/baseStats/nidorina.asm | 1 - data/baseStats/nidorino.asm | 1 - data/baseStats/ninetails.asm | 1 - data/baseStats/oddish.asm | 1 - data/baseStats/omanyte.asm | 1 - data/baseStats/omastar.asm | 1 - data/baseStats/onix.asm | 1 - data/baseStats/paras.asm | 1 - data/baseStats/parasect.asm | 1 - data/baseStats/persian.asm | 1 - data/baseStats/pidgeot.asm | 1 - data/baseStats/pidgeotto.asm | 1 - data/baseStats/pidgey.asm | 1 - data/baseStats/pikachu.asm | 1 - data/baseStats/pinsir.asm | 1 - data/baseStats/poliwag.asm | 1 - data/baseStats/poliwhirl.asm | 1 - data/baseStats/poliwrath.asm | 1 - data/baseStats/ponyta.asm | 1 - data/baseStats/porygon.asm | 1 - data/baseStats/primeape.asm | 1 - data/baseStats/psyduck.asm | 1 - data/baseStats/raichu.asm | 1 - data/baseStats/rapidash.asm | 1 - data/baseStats/raticate.asm | 1 - data/baseStats/rattata.asm | 1 - data/baseStats/rhydon.asm | 3 --- data/baseStats/rhyhorn.asm | 1 - data/baseStats/sandshrew.asm | 1 - data/baseStats/sandslash.asm | 1 - data/baseStats/scyther.asm | 1 - data/baseStats/seadra.asm | 1 - data/baseStats/seaking.asm | 1 - data/baseStats/seel.asm | 1 - data/baseStats/shellder.asm | 1 - data/baseStats/slowbro.asm | 1 - data/baseStats/slowpoke.asm | 1 - data/baseStats/snorlax.asm | 1 - data/baseStats/spearow.asm | 1 - data/baseStats/squirtle.asm | 1 - data/baseStats/starmie.asm | 1 - data/baseStats/staryu.asm | 1 - data/baseStats/tangela.asm | 1 - data/baseStats/tauros.asm | 1 - data/baseStats/tentacool.asm | 1 - data/baseStats/tentacruel.asm | 1 - data/baseStats/vaporeon.asm | 1 - data/baseStats/venomoth.asm | 1 - data/baseStats/venonat.asm | 1 - data/baseStats/venusaur.asm | 1 - data/baseStats/victreebel.asm | 1 - data/baseStats/vileplume.asm | 1 - data/baseStats/voltorb.asm | 1 - data/baseStats/vulpix.asm | 1 - data/baseStats/wartortle.asm | 1 - data/baseStats/weedle.asm | 1 - data/baseStats/weepinbell.asm | 1 - data/baseStats/weezing.asm | 1 - data/baseStats/wigglytuff.asm | 1 - data/baseStats/zapdos.asm | 1 - data/baseStats/zubat.asm | 1 - 151 files changed, 3 insertions(+), 153 deletions(-) mode change 100755 => 100644 data/baseStats/abra.asm mode change 100755 => 100644 data/baseStats/aerodactyl.asm mode change 100755 => 100644 data/baseStats/alakazam.asm mode change 100755 => 100644 data/baseStats/arbok.asm mode change 100755 => 100644 data/baseStats/arcanine.asm mode change 100755 => 100644 data/baseStats/articuno.asm mode change 100755 => 100644 data/baseStats/beedrill.asm mode change 100755 => 100644 data/baseStats/bellsprout.asm mode change 100755 => 100644 data/baseStats/blastoise.asm mode change 100755 => 100644 data/baseStats/bulbasaur.asm mode change 100755 => 100644 data/baseStats/butterfree.asm mode change 100755 => 100644 data/baseStats/caterpie.asm mode change 100755 => 100644 data/baseStats/chansey.asm mode change 100755 => 100644 data/baseStats/charizard.asm mode change 100755 => 100644 data/baseStats/charmander.asm mode change 100755 => 100644 data/baseStats/charmeleon.asm mode change 100755 => 100644 data/baseStats/clefable.asm mode change 100755 => 100644 data/baseStats/clefairy.asm mode change 100755 => 100644 data/baseStats/cloyster.asm mode change 100755 => 100644 data/baseStats/cubone.asm mode change 100755 => 100644 data/baseStats/dewgong.asm mode change 100755 => 100644 data/baseStats/diglett.asm mode change 100755 => 100644 data/baseStats/ditto.asm mode change 100755 => 100644 data/baseStats/dodrio.asm mode change 100755 => 100644 data/baseStats/doduo.asm mode change 100755 => 100644 data/baseStats/dragonair.asm mode change 100755 => 100644 data/baseStats/dragonite.asm mode change 100755 => 100644 data/baseStats/dratini.asm mode change 100755 => 100644 data/baseStats/drowzee.asm mode change 100755 => 100644 data/baseStats/dugtrio.asm mode change 100755 => 100644 data/baseStats/eevee.asm mode change 100755 => 100644 data/baseStats/ekans.asm mode change 100755 => 100644 data/baseStats/electabuzz.asm mode change 100755 => 100644 data/baseStats/electrode.asm mode change 100755 => 100644 data/baseStats/exeggcute.asm mode change 100755 => 100644 data/baseStats/exeggutor.asm mode change 100755 => 100644 data/baseStats/farfetchd.asm mode change 100755 => 100644 data/baseStats/fearow.asm mode change 100755 => 100644 data/baseStats/flareon.asm mode change 100755 => 100644 data/baseStats/gastly.asm mode change 100755 => 100644 data/baseStats/gengar.asm mode change 100755 => 100644 data/baseStats/geodude.asm mode change 100755 => 100644 data/baseStats/gloom.asm mode change 100755 => 100644 data/baseStats/golbat.asm mode change 100755 => 100644 data/baseStats/goldeen.asm mode change 100755 => 100644 data/baseStats/golduck.asm mode change 100755 => 100644 data/baseStats/golem.asm mode change 100755 => 100644 data/baseStats/graveler.asm mode change 100755 => 100644 data/baseStats/grimer.asm mode change 100755 => 100644 data/baseStats/growlithe.asm mode change 100755 => 100644 data/baseStats/gyarados.asm mode change 100755 => 100644 data/baseStats/haunter.asm mode change 100755 => 100644 data/baseStats/hitmonchan.asm mode change 100755 => 100644 data/baseStats/hitmonlee.asm mode change 100755 => 100644 data/baseStats/horsea.asm mode change 100755 => 100644 data/baseStats/hypno.asm mode change 100755 => 100644 data/baseStats/ivysaur.asm mode change 100755 => 100644 data/baseStats/jigglypuff.asm mode change 100755 => 100644 data/baseStats/jolteon.asm mode change 100755 => 100644 data/baseStats/jynx.asm mode change 100755 => 100644 data/baseStats/kabuto.asm mode change 100755 => 100644 data/baseStats/kabutops.asm mode change 100755 => 100644 data/baseStats/kadabra.asm mode change 100755 => 100644 data/baseStats/kakuna.asm mode change 100755 => 100644 data/baseStats/kangaskhan.asm mode change 100755 => 100644 data/baseStats/kingler.asm mode change 100755 => 100644 data/baseStats/koffing.asm mode change 100755 => 100644 data/baseStats/krabby.asm mode change 100755 => 100644 data/baseStats/lapras.asm mode change 100755 => 100644 data/baseStats/lickitung.asm mode change 100755 => 100644 data/baseStats/machamp.asm mode change 100755 => 100644 data/baseStats/machoke.asm mode change 100755 => 100644 data/baseStats/machop.asm mode change 100755 => 100644 data/baseStats/magikarp.asm mode change 100755 => 100644 data/baseStats/magmar.asm mode change 100755 => 100644 data/baseStats/magnemite.asm mode change 100755 => 100644 data/baseStats/magneton.asm mode change 100755 => 100644 data/baseStats/mankey.asm mode change 100755 => 100644 data/baseStats/marowak.asm mode change 100755 => 100644 data/baseStats/meowth.asm mode change 100755 => 100644 data/baseStats/metapod.asm mode change 100755 => 100644 data/baseStats/mew.asm mode change 100755 => 100644 data/baseStats/mewtwo.asm mode change 100755 => 100644 data/baseStats/moltres.asm mode change 100755 => 100644 data/baseStats/mrmime.asm mode change 100755 => 100644 data/baseStats/muk.asm mode change 100755 => 100644 data/baseStats/nidoking.asm mode change 100755 => 100644 data/baseStats/nidoqueen.asm mode change 100755 => 100644 data/baseStats/nidoranf.asm mode change 100755 => 100644 data/baseStats/nidoranm.asm mode change 100755 => 100644 data/baseStats/nidorina.asm mode change 100755 => 100644 data/baseStats/nidorino.asm mode change 100755 => 100644 data/baseStats/ninetails.asm mode change 100755 => 100644 data/baseStats/oddish.asm mode change 100755 => 100644 data/baseStats/omanyte.asm mode change 100755 => 100644 data/baseStats/omastar.asm mode change 100755 => 100644 data/baseStats/onix.asm mode change 100755 => 100644 data/baseStats/paras.asm mode change 100755 => 100644 data/baseStats/parasect.asm mode change 100755 => 100644 data/baseStats/persian.asm mode change 100755 => 100644 data/baseStats/pidgeot.asm mode change 100755 => 100644 data/baseStats/pidgeotto.asm mode change 100755 => 100644 data/baseStats/pidgey.asm mode change 100755 => 100644 data/baseStats/pikachu.asm mode change 100755 => 100644 data/baseStats/pinsir.asm mode change 100755 => 100644 data/baseStats/poliwag.asm mode change 100755 => 100644 data/baseStats/poliwhirl.asm mode change 100755 => 100644 data/baseStats/poliwrath.asm mode change 100755 => 100644 data/baseStats/ponyta.asm mode change 100755 => 100644 data/baseStats/porygon.asm mode change 100755 => 100644 data/baseStats/primeape.asm mode change 100755 => 100644 data/baseStats/psyduck.asm mode change 100755 => 100644 data/baseStats/raichu.asm mode change 100755 => 100644 data/baseStats/rapidash.asm mode change 100755 => 100644 data/baseStats/raticate.asm mode change 100755 => 100644 data/baseStats/rattata.asm mode change 100755 => 100644 data/baseStats/rhydon.asm mode change 100755 => 100644 data/baseStats/rhyhorn.asm mode change 100755 => 100644 data/baseStats/sandshrew.asm mode change 100755 => 100644 data/baseStats/sandslash.asm mode change 100755 => 100644 data/baseStats/scyther.asm mode change 100755 => 100644 data/baseStats/seadra.asm mode change 100755 => 100644 data/baseStats/seaking.asm mode change 100755 => 100644 data/baseStats/seel.asm mode change 100755 => 100644 data/baseStats/shellder.asm mode change 100755 => 100644 data/baseStats/slowbro.asm mode change 100755 => 100644 data/baseStats/slowpoke.asm mode change 100755 => 100644 data/baseStats/snorlax.asm mode change 100755 => 100644 data/baseStats/spearow.asm mode change 100755 => 100644 data/baseStats/squirtle.asm mode change 100755 => 100644 data/baseStats/starmie.asm mode change 100755 => 100644 data/baseStats/staryu.asm mode change 100755 => 100644 data/baseStats/tangela.asm mode change 100755 => 100644 data/baseStats/tauros.asm mode change 100755 => 100644 data/baseStats/tentacool.asm mode change 100755 => 100644 data/baseStats/tentacruel.asm mode change 100755 => 100644 data/baseStats/vaporeon.asm mode change 100755 => 100644 data/baseStats/venomoth.asm mode change 100755 => 100644 data/baseStats/venonat.asm mode change 100755 => 100644 data/baseStats/venusaur.asm mode change 100755 => 100644 data/baseStats/victreebel.asm mode change 100755 => 100644 data/baseStats/vileplume.asm mode change 100755 => 100644 data/baseStats/voltorb.asm mode change 100755 => 100644 data/baseStats/vulpix.asm mode change 100755 => 100644 data/baseStats/wartortle.asm mode change 100755 => 100644 data/baseStats/weedle.asm mode change 100755 => 100644 data/baseStats/weepinbell.asm mode change 100755 => 100644 data/baseStats/weezing.asm mode change 100755 => 100644 data/baseStats/wigglytuff.asm mode change 100755 => 100644 data/baseStats/zapdos.asm mode change 100755 => 100644 data/baseStats/zubat.asm diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm old mode 100755 new mode 100644 index bb5b15e5..1a41bb5c --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -1,4 +1,3 @@ -AbraBaseStats: ; 38aa6 (e:4aa6) db DEX_ABRA ; pokedex id db 25 ; base hp db 20 ; base attack diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm old mode 100755 new mode 100644 index 949d39dc..874dd57d --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -1,4 +1,3 @@ -AerodactylBaseStats: ; 3934a (e:534a) db DEX_AERODACTYL ; pokedex id db 80 ; base hp db 105 ; base attack diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm old mode 100755 new mode 100644 index f61e5a48..6762eb83 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -1,4 +1,3 @@ -AlakazamBaseStats: ; 38ade (e:4ade) db DEX_ALAKAZAM ; pokedex id db 55 ; base hp db 50 ; base attack diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm old mode 100755 new mode 100644 index 34a73933..6beee569 --- a/data/baseStats/arbok.asm +++ b/data/baseStats/arbok.asm @@ -1,4 +1,3 @@ -ArbokBaseStats: ; 38662 (e:4662) db DEX_ARBOK ; pokedex id db 60 ; base hp db 85 ; base attack diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm old mode 100755 new mode 100644 index 4d4e8f77..2a2dda3b --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -1,4 +1,3 @@ -ArcanineBaseStats: ; 38a36 (e:4a36) db DEX_ARCANINE ; pokedex id db 90 ; base hp db 110 ; base attack diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm old mode 100755 new mode 100644 index 31c328ed..ef791055 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -1,4 +1,3 @@ -ArticunoBaseStats: ; 39382 (e:5382) db DEX_ARTICUNO ; pokedex id db 90 ; base hp db 85 ; base attack diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm old mode 100755 new mode 100644 index b3c85f3d..6bf091b8 --- a/data/baseStats/beedrill.asm +++ b/data/baseStats/beedrill.asm @@ -1,4 +1,3 @@ -BeedrillBaseStats: ; 38566 (e:4566) db DEX_BEEDRILL ; pokedex id db 65 ; base hp db 80 ; base attack diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm old mode 100755 new mode 100644 index d6297826..1c908bbb --- a/data/baseStats/bellsprout.asm +++ b/data/baseStats/bellsprout.asm @@ -1,4 +1,3 @@ -BellsproutBaseStats: ; 38b4e (e:4b4e) db DEX_BELLSPROUT ; pokedex id db 50 ; base hp db 75 ; base attack diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm old mode 100755 new mode 100644 index e5ccd2db..eaf18b41 --- a/data/baseStats/blastoise.asm +++ b/data/baseStats/blastoise.asm @@ -1,4 +1,3 @@ -BlastoiseBaseStats: ; 384be (e:44be) db DEX_BLASTOISE ; pokedex id db 79 ; base hp db 83 ; base attack diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm old mode 100755 new mode 100644 index 261b28ee..7b3567b5 --- a/data/baseStats/bulbasaur.asm +++ b/data/baseStats/bulbasaur.asm @@ -1,4 +1,4 @@ -BulbasaurBaseStats: ; 383de (e:43de) +MonBaseStats: db DEX_BULBASAUR ; pokedex id db 45 ; base hp db 49 ; base attack @@ -27,3 +27,4 @@ db 3 ; growth rate tmlearn 44 tmlearn 50,51 db 0 ; padding +MonBaseStatsEnd: diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm old mode 100755 new mode 100644 index 74a6a0bb..75a0ee02 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -1,4 +1,3 @@ -ButterfreeBaseStats: ; 38512 (e:4512) db DEX_BUTTERFREE ; pokedex id db 60 ; base hp db 45 ; base attack diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm old mode 100755 new mode 100644 index 975f31a1..d26bc5d9 --- a/data/baseStats/caterpie.asm +++ b/data/baseStats/caterpie.asm @@ -1,4 +1,3 @@ -CaterpieBaseStats: ; 384da (e:44da) db DEX_CATERPIE ; pokedex id db 45 ; base hp db 30 ; base attack diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm old mode 100755 new mode 100644 index a830ae1e..d9b8513d --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -1,4 +1,3 @@ -ChanseyBaseStats: ; 3901e (e:501e) db DEX_CHANSEY ; pokedex id db 250 ; base hp db 5 ; base attack diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm old mode 100755 new mode 100644 index c75d9a34..ea978159 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -1,4 +1,3 @@ -CharizardBaseStats: ; 3846a (e:446a) db DEX_CHARIZARD ; pokedex id db 78 ; base hp db 84 ; base attack diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm old mode 100755 new mode 100644 index 936befa4..ccd53458 --- a/data/baseStats/charmander.asm +++ b/data/baseStats/charmander.asm @@ -1,4 +1,3 @@ -CharmanderBaseStats: ; 38432 (e:4432) db DEX_CHARMANDER ; pokedex id db 39 ; base hp db 52 ; base attack diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm old mode 100755 new mode 100644 index 8e2675f0..80aa2bca --- a/data/baseStats/charmeleon.asm +++ b/data/baseStats/charmeleon.asm @@ -1,4 +1,3 @@ -CharmeleonBaseStats: ; 3844e (e:444e) db DEX_CHARMELEON ; pokedex id db 58 ; base hp db 64 ; base attack diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm old mode 100755 new mode 100644 index e26f1445..17837da4 --- a/data/baseStats/clefable.asm +++ b/data/baseStats/clefable.asm @@ -1,4 +1,3 @@ -ClefableBaseStats: ; 387b2 (e:47b2) db DEX_CLEFABLE ; pokedex id db 95 ; base hp db 70 ; base attack diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm old mode 100755 new mode 100644 index cc47df10..952391c7 --- a/data/baseStats/clefairy.asm +++ b/data/baseStats/clefairy.asm @@ -1,4 +1,3 @@ -ClefairyBaseStats: ; 38796 (e:4796) db DEX_CLEFAIRY ; pokedex id db 70 ; base hp db 45 ; base attack diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm old mode 100755 new mode 100644 index aa09d48a..10f38bdb --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -1,4 +1,3 @@ -CloysterBaseStats: ; 38db6 (e:4db6) db DEX_CLOYSTER ; pokedex id db 50 ; base hp db 95 ; base attack diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm old mode 100755 new mode 100644 index 74584844..b1222d98 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -1,4 +1,3 @@ -CuboneBaseStats: ; 38f22 (e:4f22) db DEX_CUBONE ; pokedex id db 50 ; base hp db 50 ; base attack diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm old mode 100755 new mode 100644 index e7efc42b..fb0cf2c2 --- a/data/baseStats/dewgong.asm +++ b/data/baseStats/dewgong.asm @@ -1,4 +1,3 @@ -DewgongBaseStats: ; 38d46 (e:4d46) db DEX_DEWGONG ; pokedex id db 90 ; base hp db 70 ; base attack diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm old mode 100755 new mode 100644 index af0cab55..173dfa3d --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -1,4 +1,3 @@ -DiglettBaseStats: ; 3893a (e:493a) db DEX_DIGLETT ; pokedex id db 10 ; base hp db 55 ; base attack diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm old mode 100755 new mode 100644 index 88def477..90ea4c5e --- a/data/baseStats/ditto.asm +++ b/data/baseStats/ditto.asm @@ -1,4 +1,3 @@ -DittoBaseStats: ; 39232 (e:5232) db DEX_DITTO ; pokedex id db 48 ; base hp db 48 ; base attack diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm old mode 100755 new mode 100644 index 025204fb..99608f48 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -1,4 +1,3 @@ -DodrioBaseStats: ; 38d0e (e:4d0e) db DEX_DODRIO ; pokedex id db 60 ; base hp db 110 ; base attack diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm old mode 100755 new mode 100644 index 091152dd..760c258b --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -1,4 +1,3 @@ -DoduoBaseStats: ; 38cf2 (e:4cf2) db DEX_DODUO ; pokedex id db 35 ; base hp db 85 ; base attack diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm old mode 100755 new mode 100644 index b8f0a606..041300e0 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -1,4 +1,3 @@ -DragonairBaseStats: ; 393f2 (e:53f2) db DEX_DRAGONAIR ; pokedex id db 61 ; base hp db 84 ; base attack diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm old mode 100755 new mode 100644 index 1000e384..442275b2 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -1,4 +1,3 @@ -DragoniteBaseStats: ; 3940e (e:540e) db DEX_DRAGONITE ; pokedex id db 91 ; base hp db 134 ; base attack diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm old mode 100755 new mode 100644 index 37ed8f09..5fb5c75d --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -1,4 +1,3 @@ -DratiniBaseStats: ; 393d6 (e:53d6) db DEX_DRATINI ; pokedex id db 41 ; base hp db 64 ; base attack diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm old mode 100755 new mode 100644 index 6397eeaf..452db1bc --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -1,4 +1,3 @@ -DrowzeeBaseStats: ; 38e42 (e:4e42) db DEX_DROWZEE ; pokedex id db 60 ; base hp db 48 ; base attack diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm old mode 100755 new mode 100644 index f60dc1c0..b70b5383 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -1,4 +1,3 @@ -DugtrioBaseStats: ; 38956 (e:4956) db DEX_DUGTRIO ; pokedex id db 35 ; base hp db 80 ; base attack diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm old mode 100755 new mode 100644 index 2c2114fb..0fa869fe --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -1,4 +1,3 @@ -EeveeBaseStats: ; 3924e (e:524e) db DEX_EEVEE ; pokedex id db 55 ; base hp db 55 ; base attack diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm old mode 100755 new mode 100644 index 26e75eeb..b029a67c --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -1,4 +1,3 @@ -EkansBaseStats: ; 38646 (e:4646) db DEX_EKANS ; pokedex id db 35 ; base hp db 60 ; base attack diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm old mode 100755 new mode 100644 index 5dc76c37..4b44604e --- a/data/baseStats/electabuzz.asm +++ b/data/baseStats/electabuzz.asm @@ -1,4 +1,3 @@ -ElectabuzzBaseStats: ; 3916e (e:516e) db DEX_ELECTABUZZ ; pokedex id db 65 ; base hp db 83 ; base attack diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm old mode 100755 new mode 100644 index dc9da8d3..1b292f2f --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -1,4 +1,3 @@ -ElectrodeBaseStats: ; 38ece (e:4ece) db DEX_ELECTRODE ; pokedex id db 60 ; base hp db 50 ; base attack diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm old mode 100755 new mode 100644 index 4c77db2a..8503889b --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -1,4 +1,3 @@ -ExeggcuteBaseStats: ; 38eea (e:4eea) db DEX_EXEGGCUTE ; pokedex id db 60 ; base hp db 40 ; base attack diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm old mode 100755 new mode 100644 index f67857e2..4d739430 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -1,4 +1,3 @@ -ExeggutorBaseStats: ; 38f06 (e:4f06) db DEX_EXEGGUTOR ; pokedex id db 95 ; base hp db 95 ; base attack diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm old mode 100755 new mode 100644 index a1084b17..2aa7eca0 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -1,4 +1,3 @@ -FarfetchdBaseStats: ; 38cd6 (e:4cd6) db DEX_FARFETCHD ; pokedex id db 52 ; base hp db 65 ; base attack diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm old mode 100755 new mode 100644 index 8d3059db..4ad88723 --- a/data/baseStats/fearow.asm +++ b/data/baseStats/fearow.asm @@ -1,4 +1,3 @@ -FearowBaseStats: ; 3862a (e:462a) db DEX_FEAROW ; pokedex id db 65 ; base hp db 90 ; base attack diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm old mode 100755 new mode 100644 index 48c4b702..c6c0c060 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -1,4 +1,3 @@ -FlareonBaseStats: ; 392a2 (e:52a2) db DEX_FLAREON ; pokedex id db 65 ; base hp db 130 ; base attack diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm old mode 100755 new mode 100644 index c6e69bd2..fdcaaa71 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -1,4 +1,3 @@ -GastlyBaseStats: ; 38dd2 (e:4dd2) db DEX_GASTLY ; pokedex id db 30 ; base hp db 35 ; base attack diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm old mode 100755 new mode 100644 index 910903d0..0e3e877c --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -1,4 +1,3 @@ -GengarBaseStats: ; 38e0a (e:4e0a) db DEX_GENGAR ; pokedex id db 60 ; base hp db 65 ; base attack diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm old mode 100755 new mode 100644 index e185e3c0..a47a993a --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -1,4 +1,3 @@ -GeodudeBaseStats: ; 38bda (e:4bda) db DEX_GEODUDE ; pokedex id db 40 ; base hp db 80 ; base attack diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm old mode 100755 new mode 100644 index efee0dae..f2153e5c --- a/data/baseStats/gloom.asm +++ b/data/baseStats/gloom.asm @@ -1,4 +1,3 @@ -GloomBaseStats: ; 38892 (e:4892) db DEX_GLOOM ; pokedex id db 60 ; base hp db 65 ; base attack diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm old mode 100755 new mode 100644 index e6a22f70..845adf4b --- a/data/baseStats/golbat.asm +++ b/data/baseStats/golbat.asm @@ -1,4 +1,3 @@ -GolbatBaseStats: ; 3885a (e:485a) db DEX_GOLBAT ; pokedex id db 75 ; base hp db 80 ; base attack diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm old mode 100755 new mode 100644 index 36cf0d96..ed3a4fdb --- a/data/baseStats/goldeen.asm +++ b/data/baseStats/goldeen.asm @@ -1,4 +1,3 @@ -GoldeenBaseStats: ; 390aa (e:50aa) db DEX_GOLDEEN ; pokedex id db 45 ; base hp db 67 ; base attack diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm old mode 100755 new mode 100644 index e063ae47..cce89da7 --- a/data/baseStats/golduck.asm +++ b/data/baseStats/golduck.asm @@ -1,4 +1,3 @@ -GolduckBaseStats: ; 389c6 (e:49c6) db DEX_GOLDUCK ; pokedex id db 80 ; base hp db 82 ; base attack diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm old mode 100755 new mode 100644 index 1308bc78..28f2a326 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -1,4 +1,3 @@ -GolemBaseStats: ; 38c12 (e:4c12) db DEX_GOLEM ; pokedex id db 80 ; base hp db 110 ; base attack diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm old mode 100755 new mode 100644 index 8cc740dd..08776ab1 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -1,4 +1,3 @@ -GravelerBaseStats: ; 38bf6 (e:4bf6) db DEX_GRAVELER ; pokedex id db 55 ; base hp db 95 ; base attack diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm old mode 100755 new mode 100644 index 55aedc95..5f7a64a7 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -1,4 +1,3 @@ -GrimerBaseStats: ; 38d62 (e:4d62) db DEX_GRIMER ; pokedex id db 80 ; base hp db 80 ; base attack diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm old mode 100755 new mode 100644 index cc4d1ff7..df305636 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -1,4 +1,3 @@ -GrowlitheBaseStats: ; 38a1a (e:4a1a) db DEX_GROWLITHE ; pokedex id db 55 ; base hp db 70 ; base attack diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm old mode 100755 new mode 100644 index 1b374f08..21214d0b --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -1,4 +1,3 @@ -GyaradosBaseStats: ; 391fa (e:51fa) db DEX_GYARADOS ; pokedex id db 95 ; base hp db 125 ; base attack diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm old mode 100755 new mode 100644 index a530108a..bd39eaf4 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -1,4 +1,3 @@ -HaunterBaseStats: ; 38dee (e:4dee) db DEX_HAUNTER ; pokedex id db 45 ; base hp db 50 ; base attack diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm old mode 100755 new mode 100644 index 4a717248..37021f65 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -1,4 +1,3 @@ -HitmonchanBaseStats: ; 38f76 (e:4f76) db DEX_HITMONCHAN ; pokedex id db 50 ; base hp db 105 ; base attack diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm old mode 100755 new mode 100644 index e25bb725..d16db130 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -1,4 +1,3 @@ -HitmonleeBaseStats: ; 38f5a (e:4f5a) db DEX_HITMONLEE ; pokedex id db 50 ; base hp db 120 ; base attack diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm old mode 100755 new mode 100644 index b754f425..01de3ff6 --- a/data/baseStats/horsea.asm +++ b/data/baseStats/horsea.asm @@ -1,4 +1,3 @@ -HorseaBaseStats: ; 39072 (e:5072) db DEX_HORSEA ; pokedex id db 30 ; base hp db 40 ; base attack diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm old mode 100755 new mode 100644 index 3ba1ad30..4e4959b4 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -1,4 +1,3 @@ -HypnoBaseStats: ; 38e5e (e:4e5e) db DEX_HYPNO ; pokedex id db 85 ; base hp db 73 ; base attack diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm old mode 100755 new mode 100644 index 9672935e..3e19f2a1 --- a/data/baseStats/ivysaur.asm +++ b/data/baseStats/ivysaur.asm @@ -1,4 +1,3 @@ -IvysaurBaseStats: ; 383fa (e:43fa) db DEX_IVYSAUR ; pokedex id db 60 ; base hp db 62 ; base attack diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm old mode 100755 new mode 100644 index 5111e9c8..fac03fc9 --- a/data/baseStats/jigglypuff.asm +++ b/data/baseStats/jigglypuff.asm @@ -1,4 +1,3 @@ -JigglypuffBaseStats: ; 38806 (e:4806) db DEX_JIGGLYPUFF ; pokedex id db 115 ; base hp db 45 ; base attack diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm old mode 100755 new mode 100644 index 8ade6544..eb0bf305 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -1,4 +1,3 @@ -JolteonBaseStats: ; 39286 (e:5286) db DEX_JOLTEON ; pokedex id db 65 ; base hp db 65 ; base attack diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm old mode 100755 new mode 100644 index 82778775..e69b87b9 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -1,4 +1,3 @@ -JynxBaseStats: ; 39152 (e:5152) db DEX_JYNX ; pokedex id db 65 ; base hp db 50 ; base attack diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm old mode 100755 new mode 100644 index 1fde7156..60f3e959 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -1,4 +1,3 @@ -KabutoBaseStats: ; 39312 (e:5312) db DEX_KABUTO ; pokedex id db 30 ; base hp db 80 ; base attack diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm old mode 100755 new mode 100644 index 170fee9b..dbddab2e --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -1,4 +1,3 @@ -KabutopsBaseStats: ; 3932e (e:532e) db DEX_KABUTOPS ; pokedex id db 60 ; base hp db 115 ; base attack diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm old mode 100755 new mode 100644 index 5fa0e466..ad4ac7f7 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -1,4 +1,3 @@ -KadabraBaseStats: ; 38ac2 (e:4ac2) db DEX_KADABRA ; pokedex id db 40 ; base hp db 35 ; base attack diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm old mode 100755 new mode 100644 index 4ee90925..ec593f91 --- a/data/baseStats/kakuna.asm +++ b/data/baseStats/kakuna.asm @@ -1,4 +1,3 @@ -KakunaBaseStats: ; 3854a (e:454a) db DEX_KAKUNA ; pokedex id db 45 ; base hp db 25 ; base attack diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm old mode 100755 new mode 100644 index a17cb653..6dcd1e3c --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -1,4 +1,3 @@ -KangaskhanBaseStats: ; 39056 (e:5056) db DEX_KANGASKHAN ; pokedex id db 105 ; base hp db 95 ; base attack diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm old mode 100755 new mode 100644 index 7604bf80..8708d5cf --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -1,4 +1,3 @@ -KinglerBaseStats: ; 38e96 (e:4e96) db DEX_KINGLER ; pokedex id db 55 ; base hp db 130 ; base attack diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm old mode 100755 new mode 100644 index 24f47d17..fced6246 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -1,4 +1,3 @@ -KoffingBaseStats: ; 38fae (e:4fae) db DEX_KOFFING ; pokedex id db 40 ; base hp db 65 ; base attack diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm old mode 100755 new mode 100644 index 3d901041..88d690b6 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -1,4 +1,3 @@ -KrabbyBaseStats: ; 38e7a (e:4e7a) db DEX_KRABBY ; pokedex id db 30 ; base hp db 105 ; base attack diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm old mode 100755 new mode 100644 index 71555c5e..3a897525 --- a/data/baseStats/lapras.asm +++ b/data/baseStats/lapras.asm @@ -1,4 +1,3 @@ -LaprasBaseStats: ; 39216 (e:5216) db DEX_LAPRAS ; pokedex id db 130 ; base hp db 85 ; base attack diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm old mode 100755 new mode 100644 index eec9d2f3..05020627 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -1,4 +1,3 @@ -LickitungBaseStats: ; 38f92 (e:4f92) db DEX_LICKITUNG ; pokedex id db 90 ; base hp db 55 ; base attack diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm old mode 100755 new mode 100644 index c9ca26dd..b461d45a --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -1,4 +1,3 @@ -MachampBaseStats: ; 38b32 (e:4b32) db DEX_MACHAMP ; pokedex id db 90 ; base hp db 130 ; base attack diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm old mode 100755 new mode 100644 index 6e2a977e..b8a41efd --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -1,4 +1,3 @@ -MachokeBaseStats: ; 38b16 (e:4b16) db DEX_MACHOKE ; pokedex id db 80 ; base hp db 100 ; base attack diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm old mode 100755 new mode 100644 index 6e9f5ca0..9ed22dc2 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -1,4 +1,3 @@ -MachopBaseStats: ; 38afa (e:4afa) db DEX_MACHOP ; pokedex id db 70 ; base hp db 80 ; base attack diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm old mode 100755 new mode 100644 index 95f72547..50cc651c --- a/data/baseStats/magikarp.asm +++ b/data/baseStats/magikarp.asm @@ -1,4 +1,3 @@ -MagikarpBaseStats: ; 391de (e:51de) db DEX_MAGIKARP ; pokedex id db 20 ; base hp db 10 ; base attack diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm old mode 100755 new mode 100644 index 781c9edc..379e91df --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -1,4 +1,3 @@ -MagmarBaseStats: ; 3918a (e:518a) db DEX_MAGMAR ; pokedex id db 65 ; base hp db 95 ; base attack diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm old mode 100755 new mode 100644 index 79f84923..ce042457 --- a/data/baseStats/magnemite.asm +++ b/data/baseStats/magnemite.asm @@ -1,4 +1,3 @@ -MagnemiteBaseStats: ; 38c9e (e:4c9e) db DEX_MAGNEMITE ; pokedex id db 25 ; base hp db 35 ; base attack diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm old mode 100755 new mode 100644 index c8606619..a2890bbd --- a/data/baseStats/magneton.asm +++ b/data/baseStats/magneton.asm @@ -1,4 +1,3 @@ -MagnetonBaseStats: ; 38cba (e:4cba) db DEX_MAGNETON ; pokedex id db 50 ; base hp db 60 ; base attack diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm old mode 100755 new mode 100644 index 759fe599..406a1364 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -1,4 +1,3 @@ -MankeyBaseStats: ; 389e2 (e:49e2) db DEX_MANKEY ; pokedex id db 40 ; base hp db 80 ; base attack diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm old mode 100755 new mode 100644 index 714a45d9..152b4aaf --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -1,4 +1,3 @@ -MarowakBaseStats: ; 38f3e (e:4f3e) db DEX_MAROWAK ; pokedex id db 60 ; base hp db 80 ; base attack diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm old mode 100755 new mode 100644 index 14f82ca4..dc146cf3 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -1,4 +1,3 @@ -MeowthBaseStats: ; 38972 (e:4972) db DEX_MEOWTH ; pokedex id db 40 ; base hp db 45 ; base attack diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm old mode 100755 new mode 100644 index 981bbbfb..9da351ad --- a/data/baseStats/metapod.asm +++ b/data/baseStats/metapod.asm @@ -1,4 +1,3 @@ -MetapodBaseStats: ; 384f6 (e:44f6) db DEX_METAPOD ; pokedex id db 50 ; base hp db 20 ; base attack diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm old mode 100755 new mode 100644 index 1af20fa4..6919fd0e --- a/data/baseStats/mew.asm +++ b/data/baseStats/mew.asm @@ -1,4 +1,4 @@ -MewBaseStats: ; 425b (1:425b) +MewBaseStats: db DEX_MEW ; pokedex id db 100 ; base hp db 100 ; base attack diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm old mode 100755 new mode 100644 index 95127645..dc597345 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -1,4 +1,3 @@ -MewtwoBaseStats: ; 3942a (e:542a) db DEX_MEWTWO ; pokedex id db 106 ; base hp db 110 ; base attack diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm old mode 100755 new mode 100644 index 646d9a49..e9437405 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -1,4 +1,3 @@ -MoltresBaseStats: ; 393ba (e:53ba) db DEX_MOLTRES ; pokedex id db 90 ; base hp db 100 ; base attack diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm old mode 100755 new mode 100644 index 3182eca0..8640e340 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -1,4 +1,3 @@ -MrMimeBaseStats: ; 3911a (e:511a) db DEX_MR_MIME ; pokedex id db 40 ; base hp db 45 ; base attack diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm old mode 100755 new mode 100644 index 7ef711c3..cb15563e --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -1,4 +1,3 @@ -MukBaseStats: ; 38d7e (e:4d7e) db DEX_MUK ; pokedex id db 105 ; base hp db 105 ; base attack diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm old mode 100755 new mode 100644 index 8802f52a..ebef0965 --- a/data/baseStats/nidoking.asm +++ b/data/baseStats/nidoking.asm @@ -1,4 +1,3 @@ -NidokingBaseStats: ; 3877a (e:477a) db DEX_NIDOKING ; pokedex id db 81 ; base hp db 92 ; base attack diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm old mode 100755 new mode 100644 index 5e6ab97b..9ea29a31 --- a/data/baseStats/nidoqueen.asm +++ b/data/baseStats/nidoqueen.asm @@ -1,4 +1,3 @@ -NidoqueenBaseStats: ; 38726 (e:4726) db DEX_NIDOQUEEN ; pokedex id db 90 ; base hp db 82 ; base attack diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm old mode 100755 new mode 100644 index c3f9a6e3..67832f18 --- a/data/baseStats/nidoranf.asm +++ b/data/baseStats/nidoranf.asm @@ -1,4 +1,3 @@ -NidoranFBaseStats: ; 386ee (e:46ee) db DEX_NIDORAN_F ; pokedex id db 55 ; base hp db 47 ; base attack diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm old mode 100755 new mode 100644 index 14e9bc9f..a7882766 --- a/data/baseStats/nidoranm.asm +++ b/data/baseStats/nidoranm.asm @@ -1,4 +1,3 @@ -NidoranMBaseStats: ; 38742 (e:4742) db DEX_NIDORAN_M ; pokedex id db 46 ; base hp db 57 ; base attack diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm old mode 100755 new mode 100644 index 902286c5..0ddecf70 --- a/data/baseStats/nidorina.asm +++ b/data/baseStats/nidorina.asm @@ -1,4 +1,3 @@ -NidorinaBaseStats: ; 3870a (e:470a) db DEX_NIDORINA ; pokedex id db 70 ; base hp db 62 ; base attack diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm old mode 100755 new mode 100644 index db5844a9..fc435fc4 --- a/data/baseStats/nidorino.asm +++ b/data/baseStats/nidorino.asm @@ -1,4 +1,3 @@ -NidorinoBaseStats: ; 3875e (e:475e) db DEX_NIDORINO ; pokedex id db 61 ; base hp db 72 ; base attack diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm old mode 100755 new mode 100644 index f5339b35..e98028dc --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetails.asm @@ -1,4 +1,3 @@ -NinetalesBaseStats: ; 387ea (e:47ea) db DEX_NINETALES ; pokedex id db 73 ; base hp db 76 ; base attack diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm old mode 100755 new mode 100644 index 895ccbe1..c91c5138 --- a/data/baseStats/oddish.asm +++ b/data/baseStats/oddish.asm @@ -1,4 +1,3 @@ -OddishBaseStats: ; 38876 (e:4876) db DEX_ODDISH ; pokedex id db 45 ; base hp db 50 ; base attack diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm old mode 100755 new mode 100644 index 9246a325..3c461876 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -1,4 +1,3 @@ -OmanyteBaseStats: ; 392da (e:52da) db DEX_OMANYTE ; pokedex id db 35 ; base hp db 40 ; base attack diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm old mode 100755 new mode 100644 index 17b45efe..09a2ae77 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -1,4 +1,3 @@ -OmastarBaseStats: ; 392f6 (e:52f6) db DEX_OMASTAR ; pokedex id db 70 ; base hp db 60 ; base attack diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm old mode 100755 new mode 100644 index 4f2f8e6b..6f3be4df --- a/data/baseStats/onix.asm +++ b/data/baseStats/onix.asm @@ -1,4 +1,3 @@ -OnixBaseStats: ; 38e26 (e:4e26) db DEX_ONIX ; pokedex id db 35 ; base hp db 45 ; base attack diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm old mode 100755 new mode 100644 index daf1aaa9..2c918e68 --- a/data/baseStats/paras.asm +++ b/data/baseStats/paras.asm @@ -1,4 +1,3 @@ -ParasBaseStats: ; 388ca (e:48ca) db DEX_PARAS ; pokedex id db 35 ; base hp db 70 ; base attack diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm old mode 100755 new mode 100644 index cacf8e4b..dfa0c73e --- a/data/baseStats/parasect.asm +++ b/data/baseStats/parasect.asm @@ -1,4 +1,3 @@ -ParasectBaseStats: ; 388e6 (e:48e6) db DEX_PARASECT ; pokedex id db 60 ; base hp db 95 ; base attack diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm old mode 100755 new mode 100644 index 69429830..2f5ef125 --- a/data/baseStats/persian.asm +++ b/data/baseStats/persian.asm @@ -1,4 +1,3 @@ -PersianBaseStats: ; 3898e (e:498e) db DEX_PERSIAN ; pokedex id db 65 ; base hp db 70 ; base attack diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm old mode 100755 new mode 100644 index 19c9f2b4..05350d07 --- a/data/baseStats/pidgeot.asm +++ b/data/baseStats/pidgeot.asm @@ -1,4 +1,3 @@ -PidgeotBaseStats: ; 385ba (e:45ba) db DEX_PIDGEOT ; pokedex id db 83 ; base hp db 80 ; base attack diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm old mode 100755 new mode 100644 index 96a58cc3..74440fcc --- a/data/baseStats/pidgeotto.asm +++ b/data/baseStats/pidgeotto.asm @@ -1,4 +1,3 @@ -PidgeottoBaseStats: ; 3859e (e:459e) db DEX_PIDGEOTTO ; pokedex id db 63 ; base hp db 60 ; base attack diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm old mode 100755 new mode 100644 index 6d5e238d..ec032d6b --- a/data/baseStats/pidgey.asm +++ b/data/baseStats/pidgey.asm @@ -1,4 +1,3 @@ -PidgeyBaseStats: ; 38582 (e:4582) db DEX_PIDGEY ; pokedex id db 40 ; base hp db 45 ; base attack diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm old mode 100755 new mode 100644 index 1cd96200..09971b79 --- a/data/baseStats/pikachu.asm +++ b/data/baseStats/pikachu.asm @@ -1,4 +1,3 @@ -PikachuBaseStats: ; 3867e (e:467e) db DEX_PIKACHU ; pokedex id db 35 ; base hp db 55 ; base attack diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm old mode 100755 new mode 100644 index 8f36d87d..08c0e95a --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -1,4 +1,3 @@ -PinsirBaseStats: ; 391a6 (e:51a6) db DEX_PINSIR ; pokedex id db 65 ; base hp db 125 ; base attack diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm old mode 100755 new mode 100644 index 7df20056..8014811e --- a/data/baseStats/poliwag.asm +++ b/data/baseStats/poliwag.asm @@ -1,4 +1,3 @@ -PoliwagBaseStats: ; 38a52 (e:4a52) db DEX_POLIWAG ; pokedex id db 40 ; base hp db 50 ; base attack diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm old mode 100755 new mode 100644 index a93d2674..6209da68 --- a/data/baseStats/poliwhirl.asm +++ b/data/baseStats/poliwhirl.asm @@ -1,4 +1,3 @@ -PoliwhirlBaseStats: ; 38a6e (e:4a6e) db DEX_POLIWHIRL ; pokedex id db 65 ; base hp db 65 ; base attack diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm old mode 100755 new mode 100644 index 4d35c2cc..9489a6a3 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -1,4 +1,3 @@ -PoliwrathBaseStats: ; 38a8a (e:4a8a) db DEX_POLIWRATH ; pokedex id db 90 ; base hp db 85 ; base attack diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm old mode 100755 new mode 100644 index 9856ecbd..a6ff9e4b --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -1,4 +1,3 @@ -PonytaBaseStats: ; 38c2e (e:4c2e) db DEX_PONYTA ; pokedex id db 50 ; base hp db 85 ; base attack diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm old mode 100755 new mode 100644 index 7ccee3c8..a049fa7f --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -1,4 +1,3 @@ -PorygonBaseStats: ; 392be (e:52be) db DEX_PORYGON ; pokedex id db 65 ; base hp db 60 ; base attack diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm old mode 100755 new mode 100644 index e5ef5cc5..389aa7f7 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -1,4 +1,3 @@ -PrimeapeBaseStats: ; 389fe (e:49fe) db DEX_PRIMEAPE ; pokedex id db 65 ; base hp db 105 ; base attack diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm old mode 100755 new mode 100644 index 469097fe..db3ac79f --- a/data/baseStats/psyduck.asm +++ b/data/baseStats/psyduck.asm @@ -1,4 +1,3 @@ -PsyduckBaseStats: ; 389aa (e:49aa) db DEX_PSYDUCK ; pokedex id db 50 ; base hp db 52 ; base attack diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm old mode 100755 new mode 100644 index c6757b0b..c830483c --- a/data/baseStats/raichu.asm +++ b/data/baseStats/raichu.asm @@ -1,4 +1,3 @@ -RaichuBaseStats: ; 3869a (e:469a) db DEX_RAICHU ; pokedex id db 60 ; base hp db 90 ; base attack diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm old mode 100755 new mode 100644 index 097b95bd..c452159e --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -1,4 +1,3 @@ -RapidashBaseStats: ; 38c4a (e:4c4a) db DEX_RAPIDASH ; pokedex id db 65 ; base hp db 100 ; base attack diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm old mode 100755 new mode 100644 index 5fac0f1b..ff8373d5 --- a/data/baseStats/raticate.asm +++ b/data/baseStats/raticate.asm @@ -1,4 +1,3 @@ -RaticateBaseStats: ; 385f2 (e:45f2) db DEX_RATICATE ; pokedex id db 55 ; base hp db 81 ; base attack diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm old mode 100755 new mode 100644 index dada06bc..7edfb626 --- a/data/baseStats/rattata.asm +++ b/data/baseStats/rattata.asm @@ -1,4 +1,3 @@ -RattataBaseStats: ; 385d6 (e:45d6) db DEX_RATTATA ; pokedex id db 30 ; base hp db 56 ; base attack diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm old mode 100755 new mode 100644 index eb2396e1..d7066906 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -1,5 +1,3 @@ -MonBaseStats: -RhydonBaseStats: ; 39002 (e:5002) db DEX_RHYDON ; pokedex id db 105 ; base hp db 130 ; base attack @@ -28,4 +26,3 @@ db 5 ; growth rate tmlearn 44,48 tmlearn 50,53,54 db 0 ; padding -MonBaseStatsEnd: diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm old mode 100755 new mode 100644 index 4e292406..a6491bd5 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -1,4 +1,3 @@ -RhyhornBaseStats: ; 38fe6 (e:4fe6) db DEX_RHYHORN ; pokedex id db 80 ; base hp db 85 ; base attack diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm old mode 100755 new mode 100644 index ff12e24f..a9875a8e --- a/data/baseStats/sandshrew.asm +++ b/data/baseStats/sandshrew.asm @@ -1,4 +1,3 @@ -SandshrewBaseStats: ; 386b6 (e:46b6) db DEX_SANDSHREW ; pokedex id db 50 ; base hp db 75 ; base attack diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm old mode 100755 new mode 100644 index 2975b20f..30477eb4 --- a/data/baseStats/sandslash.asm +++ b/data/baseStats/sandslash.asm @@ -1,4 +1,3 @@ -SandslashBaseStats: ; 386d2 (e:46d2) db DEX_SANDSLASH ; pokedex id db 75 ; base hp db 100 ; base attack diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm old mode 100755 new mode 100644 index f91327f4..13de0d2b --- a/data/baseStats/scyther.asm +++ b/data/baseStats/scyther.asm @@ -1,4 +1,3 @@ -ScytherBaseStats: ; 39136 (e:5136) db DEX_SCYTHER ; pokedex id db 70 ; base hp db 110 ; base attack diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm old mode 100755 new mode 100644 index 4d28e2a3..9f28001b --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -1,4 +1,3 @@ -SeadraBaseStats: ; 3908e (e:508e) db DEX_SEADRA ; pokedex id db 55 ; base hp db 65 ; base attack diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm old mode 100755 new mode 100644 index d1087618..d4fbe8ea --- a/data/baseStats/seaking.asm +++ b/data/baseStats/seaking.asm @@ -1,4 +1,3 @@ -SeakingBaseStats: ; 390c6 (e:50c6) db DEX_SEAKING ; pokedex id db 80 ; base hp db 92 ; base attack diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm old mode 100755 new mode 100644 index b6546b6f..ef9c2898 --- a/data/baseStats/seel.asm +++ b/data/baseStats/seel.asm @@ -1,4 +1,3 @@ -SeelBaseStats: ; 38d2a (e:4d2a) db DEX_SEEL ; pokedex id db 65 ; base hp db 45 ; base attack diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm old mode 100755 new mode 100644 index fcb87404..7c2cdf9d --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -1,4 +1,3 @@ -ShellderBaseStats: ; 38d9a (e:4d9a) db DEX_SHELLDER ; pokedex id db 30 ; base hp db 65 ; base attack diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm old mode 100755 new mode 100644 index 2d1f8444..ffeda79e --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -1,4 +1,3 @@ -SlowbroBaseStats: ; 38c82 (e:4c82) db DEX_SLOWBRO ; pokedex id db 95 ; base hp db 75 ; base attack diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm old mode 100755 new mode 100644 index e5edcdb9..ea238a6e --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -1,4 +1,3 @@ -SlowpokeBaseStats: ; 38c66 (e:4c66) db DEX_SLOWPOKE ; pokedex id db 90 ; base hp db 65 ; base attack diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm old mode 100755 new mode 100644 index 0a91f37e..2d1fd6e3 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -1,4 +1,3 @@ -SnorlaxBaseStats: ; 39366 (e:5366) db DEX_SNORLAX ; pokedex id db 160 ; base hp db 110 ; base attack diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm old mode 100755 new mode 100644 index 4e90e749..eb8ab1ec --- a/data/baseStats/spearow.asm +++ b/data/baseStats/spearow.asm @@ -1,4 +1,3 @@ -SpearowBaseStats: ; 3860e (e:460e) db DEX_SPEAROW ; pokedex id db 40 ; base hp db 60 ; base attack diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm old mode 100755 new mode 100644 index 1257a3f0..f8dcd0a1 --- a/data/baseStats/squirtle.asm +++ b/data/baseStats/squirtle.asm @@ -1,4 +1,3 @@ -SquirtleBaseStats: ; 38486 (e:4486) db DEX_SQUIRTLE ; pokedex id db 44 ; base hp db 48 ; base attack diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm old mode 100755 new mode 100644 index 94c8f2d9..686dfa57 --- a/data/baseStats/starmie.asm +++ b/data/baseStats/starmie.asm @@ -1,4 +1,3 @@ -StarmieBaseStats: ; 390fe (e:50fe) db DEX_STARMIE ; pokedex id db 60 ; base hp db 75 ; base attack diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm old mode 100755 new mode 100644 index 3afbb7a5..35f51a6a --- a/data/baseStats/staryu.asm +++ b/data/baseStats/staryu.asm @@ -1,4 +1,3 @@ -StaryuBaseStats: ; 390e2 (e:50e2) db DEX_STARYU ; pokedex id db 30 ; base hp db 45 ; base attack diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm old mode 100755 new mode 100644 index a9cab332..b50a57bc --- a/data/baseStats/tangela.asm +++ b/data/baseStats/tangela.asm @@ -1,4 +1,3 @@ -TangelaBaseStats: ; 3903a (e:503a) db DEX_TANGELA ; pokedex id db 65 ; base hp db 55 ; base attack diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm old mode 100755 new mode 100644 index 39844f76..87f28ec6 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -1,4 +1,3 @@ -TaurosBaseStats: ; 391c2 (e:51c2) db DEX_TAUROS ; pokedex id db 75 ; base hp db 100 ; base attack diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm old mode 100755 new mode 100644 index 12ff9e0d..7237f083 --- a/data/baseStats/tentacool.asm +++ b/data/baseStats/tentacool.asm @@ -1,4 +1,3 @@ -TentacoolBaseStats: ; 38ba2 (e:4ba2) db DEX_TENTACOOL ; pokedex id db 40 ; base hp db 40 ; base attack diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm old mode 100755 new mode 100644 index 01a2f685..d3d93919 --- a/data/baseStats/tentacruel.asm +++ b/data/baseStats/tentacruel.asm @@ -1,4 +1,3 @@ -TentacruelBaseStats: ; 38bbe (e:4bbe) db DEX_TENTACRUEL ; pokedex id db 80 ; base hp db 70 ; base attack diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm old mode 100755 new mode 100644 index 21651202..7243a39f --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -1,4 +1,3 @@ -VaporeonBaseStats: ; 3926a (e:526a) db DEX_VAPOREON ; pokedex id db 130 ; base hp db 65 ; base attack diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm old mode 100755 new mode 100644 index e4a86f5b..01a6c3d0 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -1,4 +1,3 @@ -VenomothBaseStats: ; 3891e (e:491e) db DEX_VENOMOTH ; pokedex id db 70 ; base hp db 65 ; base attack diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm old mode 100755 new mode 100644 index 50177b34..bc643c77 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -1,4 +1,3 @@ -VenonatBaseStats: ; 38902 (e:4902) db DEX_VENONAT ; pokedex id db 60 ; base hp db 55 ; base attack diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm old mode 100755 new mode 100644 index 5052e9d0..0a457321 --- a/data/baseStats/venusaur.asm +++ b/data/baseStats/venusaur.asm @@ -1,4 +1,3 @@ -VenusaurBaseStats: ; 38416 (e:4416) db DEX_VENUSAUR ; pokedex id db 80 ; base hp db 82 ; base attack diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm old mode 100755 new mode 100644 index 0df7e22c..a56958ef --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -1,4 +1,3 @@ -VictreebelBaseStats: ; 38b86 (e:4b86) db DEX_VICTREEBEL ; pokedex id db 80 ; base hp db 105 ; base attack diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm old mode 100755 new mode 100644 index 20d1b4e4..17bb9739 --- a/data/baseStats/vileplume.asm +++ b/data/baseStats/vileplume.asm @@ -1,4 +1,3 @@ -VileplumeBaseStats: ; 388ae (e:48ae) db DEX_VILEPLUME ; pokedex id db 75 ; base hp db 80 ; base attack diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm old mode 100755 new mode 100644 index 4267990f..92d2ccb3 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -1,4 +1,3 @@ -VoltorbBaseStats: ; 38eb2 (e:4eb2) db DEX_VOLTORB ; pokedex id db 40 ; base hp db 30 ; base attack diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm old mode 100755 new mode 100644 index 80a25853..9577ae30 --- a/data/baseStats/vulpix.asm +++ b/data/baseStats/vulpix.asm @@ -1,4 +1,3 @@ -VulpixBaseStats: ; 387ce (e:47ce) db DEX_VULPIX ; pokedex id db 38 ; base hp db 41 ; base attack diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm old mode 100755 new mode 100644 index b8d1f84f..bc86bd6f --- a/data/baseStats/wartortle.asm +++ b/data/baseStats/wartortle.asm @@ -1,4 +1,3 @@ -WartortleBaseStats: ; 384a2 (e:44a2) db DEX_WARTORTLE ; pokedex id db 59 ; base hp db 63 ; base attack diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm old mode 100755 new mode 100644 index ecd788db..8370dc41 --- a/data/baseStats/weedle.asm +++ b/data/baseStats/weedle.asm @@ -1,4 +1,3 @@ -WeedleBaseStats: ; 3852e (e:452e) db DEX_WEEDLE ; pokedex id db 40 ; base hp db 35 ; base attack diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm old mode 100755 new mode 100644 index 22c6a40b..735a453f --- a/data/baseStats/weepinbell.asm +++ b/data/baseStats/weepinbell.asm @@ -1,4 +1,3 @@ -WeepinbellBaseStats: ; 38b6a (e:4b6a) db DEX_WEEPINBELL ; pokedex id db 65 ; base hp db 90 ; base attack diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm old mode 100755 new mode 100644 index 265ed3c8..0dd09dfe --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -1,4 +1,3 @@ -WeezingBaseStats: ; 38fca (e:4fca) db DEX_WEEZING ; pokedex id db 65 ; base hp db 90 ; base attack diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm old mode 100755 new mode 100644 index 13bf9b3a..d5fd08e2 --- a/data/baseStats/wigglytuff.asm +++ b/data/baseStats/wigglytuff.asm @@ -1,4 +1,3 @@ -WigglytuffBaseStats: ; 38822 (e:4822) db DEX_WIGGLYTUFF ; pokedex id db 140 ; base hp db 70 ; base attack diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm old mode 100755 new mode 100644 index 5ae1f25f..487052ba --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -1,4 +1,3 @@ -ZapdosBaseStats: ; 3939e (e:539e) db DEX_ZAPDOS ; pokedex id db 90 ; base hp db 90 ; base attack diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm old mode 100755 new mode 100644 index bafac885..1caa4259 --- a/data/baseStats/zubat.asm +++ b/data/baseStats/zubat.asm @@ -1,4 +1,3 @@ -ZubatBaseStats: ; 3883e (e:483e) db DEX_ZUBAT ; pokedex id db 40 ; base hp db 45 ; base attack -- cgit v1.3.1-sl0p From 757114cad28d59eacdf22f26cd175aca17cb5407 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Fri, 12 Feb 2016 21:10:58 -0700 Subject: Get rid of yellow ifdefs in wild Pokémon. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/wildPokemon/diglettscave.asm | 1 - data/wildPokemon/mansion1.asm | 18 +--------- data/wildPokemon/mansion2.asm | 31 +--------------- data/wildPokemon/mansion3.asm | 31 +--------------- data/wildPokemon/mansionb1.asm | 30 +--------------- data/wildPokemon/mtmoon1.asm | 34 ++++++------------ data/wildPokemon/mtmoonb1.asm | 34 ++++++------------ data/wildPokemon/mtmoonb2.asm | 34 ++++++------------ data/wildPokemon/nomons.asm | 1 - data/wildPokemon/pokemontower1.asm | 1 - data/wildPokemon/pokemontower2.asm | 1 - data/wildPokemon/pokemontower3.asm | 36 ++++++------------- data/wildPokemon/pokemontower4.asm | 36 ++++++------------- data/wildPokemon/pokemontower5.asm | 36 ++++++------------- data/wildPokemon/pokemontower6.asm | 36 ++++++------------- data/wildPokemon/pokemontower7.asm | 36 ++++++------------- data/wildPokemon/powerplant.asm | 45 ++++++++--------------- data/wildPokemon/rocktunnel1.asm | 41 ++++++--------------- data/wildPokemon/rocktunnel2.asm | 41 ++++++--------------- data/wildPokemon/route1.asm | 34 ++++++------------ data/wildPokemon/route10.asm | 19 +--------- data/wildPokemon/route11.asm | 19 +--------- data/wildPokemon/route12.asm | 35 ++---------------- data/wildPokemon/route13.asm | 35 ++---------------- data/wildPokemon/route14.asm | 20 ++--------- data/wildPokemon/route15.asm | 20 ++--------- data/wildPokemon/route16.asm | 35 ++++++------------ data/wildPokemon/route17.asm | 36 ++++++------------- data/wildPokemon/route18.asm | 36 ++++++------------- data/wildPokemon/route2.asm | 55 +++++++++++----------------- data/wildPokemon/route21.asm | 36 ++++++------------- data/wildPokemon/route22.asm | 5 ++- data/wildPokemon/route23.asm | 54 ++++++++++------------------ data/wildPokemon/route24.asm | 32 +---------------- data/wildPokemon/route25.asm | 32 +---------------- data/wildPokemon/route3.asm | 34 ++++++------------ data/wildPokemon/route4.asm | 19 +--------- data/wildPokemon/route5.asm | 32 +---------------- data/wildPokemon/route6.asm | 47 ++---------------------- data/wildPokemon/route7.asm | 32 +---------------- data/wildPokemon/route8.asm | 32 +---------------- data/wildPokemon/route9.asm | 19 +--------- data/wildPokemon/safarizone1.asm | 27 ++------------ data/wildPokemon/safarizone2.asm | 68 +++++++++++++---------------------- data/wildPokemon/safarizone3.asm | 31 +--------------- data/wildPokemon/safarizonecenter.asm | 31 +--------------- data/wildPokemon/seafoamisland1.asm | 31 +--------------- data/wildPokemon/seafoamislandb1.asm | 31 +--------------- data/wildPokemon/seafoamislandb2.asm | 31 +--------------- data/wildPokemon/seafoamislandb3.asm | 43 +--------------------- data/wildPokemon/seafoamislandb4.asm | 43 +--------------------- data/wildPokemon/unknowndungeon1.asm | 46 +++++++----------------- data/wildPokemon/unknowndungeon2.asm | 40 ++++++--------------- data/wildPokemon/unknowndungeonb1.asm | 43 ++++++++-------------- data/wildPokemon/victoryroad1.asm | 36 ++++++------------- data/wildPokemon/victoryroad2.asm | 36 ++++++------------- data/wildPokemon/victoryroad3.asm | 36 ++++++------------- data/wildPokemon/viridianforest.asm | 54 ++++++++++------------------ data/wildPokemon/waterpokemon.asm | 2 -- 59 files changed, 360 insertions(+), 1510 deletions(-) diff --git a/data/wildPokemon/diglettscave.asm b/data/wildPokemon/diglettscave.asm index 0b8ec1c7..37512687 100755 --- a/data/wildPokemon/diglettscave.asm +++ b/data/wildPokemon/diglettscave.asm @@ -11,4 +11,3 @@ CaveMons: db 29,DUGTRIO db 31,DUGTRIO db $00 - diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm index e96b9d42..22ad032b 100755 --- a/data/wildPokemon/mansion1.asm +++ b/data/wildPokemon/mansion1.asm @@ -12,8 +12,7 @@ MansionMons1: db 37,WEEZING db 39,MUK ENDC - - IF DEF(_GREEN) || DEF(_BLUE) + IF DEF(_BLUE) db 32,GRIMER db 30,GRIMER db 34,PONYTA @@ -25,19 +24,4 @@ MansionMons1: db 37,MUK db 39,WEEZING ENDC - - IF DEF(_YELLOW) - db 34,RATTATA - db 34,RATICATE - db 23,GRIMER - db 26,GROWLITHE - db 37,RATTATA - db 37,RATICATE - db 30,GROWLITHE - db 26,GRIMER - db 34,GROWLITHE - db 38,GROWLITHE - ENDC - db $00 - diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm index 77cce408..985474fc 100755 --- a/data/wildPokemon/mansion2.asm +++ b/data/wildPokemon/mansion2.asm @@ -12,8 +12,7 @@ MansionMons2: db 39,WEEZING db 37,MUK ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 32,VULPIX db 34,GRIMER db 34,GRIMER @@ -25,32 +24,4 @@ MansionMons2: db 39,MUK db 37,WEEZING ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 32,GROWLITHE - db 34,GRIMER - db 34,GRIMER - db 30,PONYTA - db 30,GRIMER - db 32,PONYTA - db 30,KOFFING - db 28,PONYTA - db 39,MUK - db 37,WEEZING - ENDC - - IF DEF(_YELLOW) - db 37,RATTATA - db 37,RATICATE - db 26,GRIMER - db 29,GRIMER - db 40,RATTATA - db 40,RATICATE - db 32,GRIMER - db 35,GRIMER - db 35,MUK - db 38,MUK - ENDC - db $00 - diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm index eceb0296..9c5521ae 100755 --- a/data/wildPokemon/mansion3.asm +++ b/data/wildPokemon/mansion3.asm @@ -12,8 +12,7 @@ MansionMons3: db 36,PONYTA db 42,MUK ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 31,GRIMER db 33,VULPIX db 35,GRIMER @@ -25,32 +24,4 @@ MansionMons3: db 36,PONYTA db 42,WEEZING ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 31,GRIMER - db 33,GROWLITHE - db 35,GRIMER - db 32,PONYTA - db 34,PONYTA - db 40,MUK - db 34,KOFFING - db 38,MUK - db 36,PONYTA - db 42,WEEZING - ENDC - - IF DEF(_YELLOW) - db 40,RATTATA - db 40,RATICATE - db 32,GRIMER - db 35,GRIMER - db 43,RATTATA - db 43,RATICATE - db 38,GRIMER - db 38,GRIMER - db 38,MUK - db 41,MUK - ENDC - db $00 - diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm index 9dcd9893..83266ddd 100755 --- a/data/wildPokemon/mansionb1.asm +++ b/data/wildPokemon/mansionb1.asm @@ -12,8 +12,7 @@ MansionMonsB1: db 42,WEEZING db 42,MUK ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 33,GRIMER db 31,GRIMER db 35,VULPIX @@ -25,31 +24,4 @@ MansionMonsB1: db 38,MAGMAR db 42,WEEZING ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 33,GRIMER - db 31,GRIMER - db 35,GROWLITHE - db 32,PONYTA - db 31,GRIMER - db 40,MUK - db 34,PONYTA - db 35,KOFFING - db 38,MUK - db 42,WEEZING - ENDC - - IF DEF(_YELLOW) - db 35,GRIMER - db 38,GRIMER - db 37,RATICATE - db 40,RATICATE - db 41,MUK - db 43,RATICATE - db 24,DITTO - db 46,RATICATE - db 18,DITTO - db 12,DITTO - ENDC - db $00 diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm index a8018b82..44b34c45 100755 --- a/data/wildPokemon/mtmoon1.asm +++ b/data/wildPokemon/mtmoon1.asm @@ -1,27 +1,13 @@ MoonMons1: db $0A - IF DEF(_YELLOW) - db 8,ZUBAT - db 9,ZUBAT - db 10,GEODUDE - db 6,ZUBAT - db 7,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 12,SANDSHREW - db 11,CLEFAIRY - ELSE - db 8,ZUBAT - db 7,ZUBAT - db 9,ZUBAT - db 8,GEODUDE - db 6,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 8,PARAS - db 11,ZUBAT - db 8,CLEFAIRY - ENDC + db 8,ZUBAT + db 7,ZUBAT + db 9,ZUBAT + db 8,GEODUDE + db 6,ZUBAT + db 10,ZUBAT + db 10,GEODUDE + db 8,PARAS + db 11,ZUBAT + db 8,CLEFAIRY db $00 - diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm index c78b8471..5c0d8a53 100755 --- a/data/wildPokemon/mtmoonb1.asm +++ b/data/wildPokemon/mtmoonb1.asm @@ -1,27 +1,13 @@ MoonMonsB1: db $0A - IF DEF(_YELLOW) - db 8,ZUBAT - db 9,ZUBAT - db 10,GEODUDE - db 6,ZUBAT - db 7,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 12,SANDSHREW - db 11,CLEFAIRY - ELSE - db 8,ZUBAT - db 7,ZUBAT - db 7,GEODUDE - db 8,GEODUDE - db 9,ZUBAT - db 10,PARAS - db 10,ZUBAT - db 11,ZUBAT - db 9,CLEFAIRY - db 9,GEODUDE - ENDC + db 8,ZUBAT + db 7,ZUBAT + db 7,GEODUDE + db 8,GEODUDE + db 9,ZUBAT + db 10,PARAS + db 10,ZUBAT + db 11,ZUBAT + db 9,CLEFAIRY + db 9,GEODUDE db $00 - diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm index 0118a898..cbf97e7e 100755 --- a/data/wildPokemon/mtmoonb2.asm +++ b/data/wildPokemon/mtmoonb2.asm @@ -1,27 +1,13 @@ MoonMonsB2: db $0A - IF DEF(_YELLOW) - db 10,ZUBAT - db 11,GEODUDE - db 13,PARAS - db 11,ZUBAT - db 11,ZUBAT - db 12,ZUBAT - db 13,ZUBAT - db 9,CLEFAIRY - db 11,CLEFAIRY - db 13,CLEFAIRY - ELSE - db 9,ZUBAT - db 9,GEODUDE - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 10,PARAS - db 12,PARAS - db 10,CLEFAIRY - db 12,ZUBAT - db 12,CLEFAIRY - ENDC + db 9,ZUBAT + db 9,GEODUDE + db 10,ZUBAT + db 10,GEODUDE + db 11,ZUBAT + db 10,PARAS + db 12,PARAS + db 10,CLEFAIRY + db 12,ZUBAT + db 12,CLEFAIRY db $00 - diff --git a/data/wildPokemon/nomons.asm b/data/wildPokemon/nomons.asm index 895cf2e0..ce7f7ede 100755 --- a/data/wildPokemon/nomons.asm +++ b/data/wildPokemon/nomons.asm @@ -1,4 +1,3 @@ NoMons: db $00 db $00 - diff --git a/data/wildPokemon/pokemontower1.asm b/data/wildPokemon/pokemontower1.asm index 4911c790..df951e70 100755 --- a/data/wildPokemon/pokemontower1.asm +++ b/data/wildPokemon/pokemontower1.asm @@ -1,4 +1,3 @@ TowerMons1: db $00 db $00 - diff --git a/data/wildPokemon/pokemontower2.asm b/data/wildPokemon/pokemontower2.asm index a849668d..dcbe0da0 100755 --- a/data/wildPokemon/pokemontower2.asm +++ b/data/wildPokemon/pokemontower2.asm @@ -1,4 +1,3 @@ TowerMons2: db $00 db $00 - diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm index 4e3a7c62..135ed84f 100755 --- a/data/wildPokemon/pokemontower3.asm +++ b/data/wildPokemon/pokemontower3.asm @@ -1,29 +1,13 @@ TowerMons3: db $0A - - IF DEF(_YELLOW) - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,GASTLY - db 20,HAUNTER - db 25,HAUNTER - ELSE - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 24,GASTLY - db 20,CUBONE - db 22,CUBONE - db 25,HAUNTER - ENDC - + db 20,GASTLY + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 19,GASTLY + db 18,GASTLY + db 24,GASTLY + db 20,CUBONE + db 22,CUBONE + db 25,HAUNTER db $00 - diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm index e0de809f..0c84b0cf 100755 --- a/data/wildPokemon/pokemontower4.asm +++ b/data/wildPokemon/pokemontower4.asm @@ -1,29 +1,13 @@ TowerMons4: db $0A - - IF DEF(_YELLOW) - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,GASTLY - db 20,HAUNTER - db 25,HAUNTER - ELSE - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,HAUNTER - db 20,CUBONE - db 22,CUBONE - db 24,GASTLY - ENDC - + db 20,GASTLY + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 19,GASTLY + db 18,GASTLY + db 25,HAUNTER + db 20,CUBONE + db 22,CUBONE + db 24,GASTLY db $00 - diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm index 9f97b98e..440dbf8d 100755 --- a/data/wildPokemon/pokemontower5.asm +++ b/data/wildPokemon/pokemontower5.asm @@ -1,29 +1,13 @@ TowerMons5: db $0A - - IF DEF(_YELLOW) - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 21,GASTLY - db 20,CUBONE - db 27,GASTLY - db 22,HAUNTER - db 27,HAUNTER - ELSE - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,HAUNTER - db 20,CUBONE - db 22,CUBONE - db 24,GASTLY - ENDC - + db 20,GASTLY + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 19,GASTLY + db 18,GASTLY + db 25,HAUNTER + db 20,CUBONE + db 22,CUBONE + db 24,GASTLY db $00 - diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm index b97e2ddd..553fdb5d 100755 --- a/data/wildPokemon/pokemontower6.asm +++ b/data/wildPokemon/pokemontower6.asm @@ -1,29 +1,13 @@ TowerMons6: db $0F - - IF DEF(_YELLOW) - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 21,GASTLY - db 22,CUBONE - db 27,GASTLY - db 22,HAUNTER - db 27,HAUNTER - ELSE - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 20,GASTLY - db 19,GASTLY - db 26,HAUNTER - db 22,CUBONE - db 24,CUBONE - db 28,HAUNTER - ENDC - + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 24,GASTLY + db 20,GASTLY + db 19,GASTLY + db 26,HAUNTER + db 22,CUBONE + db 24,CUBONE + db 28,HAUNTER db $00 - diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm index b0d94534..0f7e66e9 100755 --- a/data/wildPokemon/pokemontower7.asm +++ b/data/wildPokemon/pokemontower7.asm @@ -1,29 +1,13 @@ TowerMons7: db $0F - - IF DEF(_YELLOW) - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 27,GASTLY - db 28,GASTLY - db 23,GASTLY - db 24,CUBONE - db 29,GASTLY - db 24,HAUNTER - db 29,HAUNTER - ELSE - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 20,GASTLY - db 28,HAUNTER - db 22,CUBONE - db 24,CUBONE - db 28,HAUNTER - db 30,HAUNTER - ENDC - + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 24,GASTLY + db 20,GASTLY + db 28,HAUNTER + db 22,CUBONE + db 24,CUBONE + db 28,HAUNTER + db 30,HAUNTER db $00 - diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm index f956fcf2..35eece95 100755 --- a/data/wildPokemon/powerplant.asm +++ b/data/wildPokemon/powerplant.asm @@ -1,34 +1,19 @@ PowerPlantMons: db $0A - - IF DEF(_YELLOW) - db 30,MAGNEMITE - db 35,MAGNEMITE - db 33,MAGNETON - db 33,VOLTORB - db 37,VOLTORB - db 33,GRIMER - db 37,GRIMER - db 38,MAGNETON - db 33,MUK - db 37,MUK - ELSE - db 21,VOLTORB - db 21,MAGNEMITE - db 20,PIKACHU - db 24,PIKACHU - db 23,MAGNEMITE - db 23,VOLTORB - db 32,MAGNETON - db 35,MAGNETON - IF DEF(_RED) - db 33,ELECTABUZZ - db 36,ELECTABUZZ - ENDC - IF DEF(_GREEN) || DEF(_BLUE) - db 33,RAICHU - db 36,RAICHU - ENDC + db 21,VOLTORB + db 21,MAGNEMITE + db 20,PIKACHU + db 24,PIKACHU + db 23,MAGNEMITE + db 23,VOLTORB + db 32,MAGNETON + db 35,MAGNETON + IF DEF(_RED) + db 33,ELECTABUZZ + db 36,ELECTABUZZ + ENDC + IF DEF(_BLUE) + db 33,RAICHU + db 36,RAICHU ENDC - db $00 diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm index 992a4e73..a36f2092 100755 --- a/data/wildPokemon/rocktunnel1.asm +++ b/data/wildPokemon/rocktunnel1.asm @@ -1,34 +1,13 @@ TunnelMonsB1: db $0F - - IF DEF(_YELLOW) - db 15,ZUBAT - db 16,GEODUDE - db 17,ZUBAT - db 19,ZUBAT - db 18,GEODUDE - db 20,GEODUDE - db 21,ZUBAT - db 17,MACHOP - db 19,MACHOP - db 21,MACHOP - ELSE - db 16,ZUBAT - db 17,ZUBAT - db 17,GEODUDE - db 15,MACHOP - db 16,GEODUDE - IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) - db 18,ZUBAT - ENDC - IF (DEF(_BLUE) && DEF(_JAPAN)) - db 18,DITTO - ENDC - db 15,ZUBAT - db 17,MACHOP - db 13,ONIX - db 15,ONIX - ENDC - + db 16,ZUBAT + db 17,ZUBAT + db 17,GEODUDE + db 15,MACHOP + db 16,GEODUDE + db 18,ZUBAT + db 15,ZUBAT + db 17,MACHOP + db 13,ONIX + db 15,ONIX db $00 - diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm index 0a47d984..2fc7ef94 100755 --- a/data/wildPokemon/rocktunnel2.asm +++ b/data/wildPokemon/rocktunnel2.asm @@ -1,34 +1,13 @@ TunnelMonsB2: db $0F - - IF DEF(_YELLOW) - db 20,ZUBAT - db 17,GEODUDE - db 18,MACHOP - db 21,ZUBAT - db 22,ZUBAT - db 21,GEODUDE - db 20,MACHOP - db 14,ONIX - db 18,ONIX - db 22,ONIX - ELSE - db 16,ZUBAT - db 17,ZUBAT - db 17,GEODUDE - db 15,MACHOP - db 16,GEODUDE - IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) - db 18,ZUBAT - ENDC - IF DEF(_BLUE) && DEF(_JAPAN) - db 18,DITTO - ENDC - db 17,MACHOP - db 17,ONIX - db 13,ONIX - db 18,GEODUDE - ENDC - + db 16,ZUBAT + db 17,ZUBAT + db 17,GEODUDE + db 15,MACHOP + db 16,GEODUDE + db 18,ZUBAT + db 17,MACHOP + db 17,ONIX + db 13,ONIX + db 18,GEODUDE db $00 - diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm index 8e5b6897..f618c34f 100755 --- a/data/wildPokemon/route1.asm +++ b/data/wildPokemon/route1.asm @@ -1,27 +1,13 @@ Route1Mons: db $19 - IF DEF(_YELLOW) - db 3,PIDGEY - db 4,PIDGEY - db 2,RATTATA - db 3,RATTATA - db 2,PIDGEY - db 3,PIDGEY - db 5,PIDGEY - db 4,RATTATA - db 6,PIDGEY - db 7,PIDGEY - ELSE - db 3,PIDGEY - db 3,RATTATA - db 3,RATTATA - db 2,RATTATA - db 2,PIDGEY - db 3,PIDGEY - db 3,PIDGEY - db 4,RATTATA - db 4,PIDGEY - db 5,PIDGEY - ENDC + db 3,PIDGEY + db 3,RATTATA + db 3,RATTATA + db 2,RATTATA + db 2,PIDGEY + db 3,PIDGEY + db 3,PIDGEY + db 4,RATTATA + db 4,PIDGEY + db 5,PIDGEY db $00 - diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm index 7cfaf25c..34e0b5ee 100755 --- a/data/wildPokemon/route10.asm +++ b/data/wildPokemon/route10.asm @@ -1,6 +1,5 @@ Route10Mons: db $0F - IF DEF(_RED) db 16,VOLTORB db 16,SPEAROW @@ -13,8 +12,7 @@ Route10Mons: db 13,EKANS db 17,EKANS ENDC - - IF DEF(_BLUE) || DEF(_GREEN) + IF DEF(_BLUE) db 16,VOLTORB db 16,SPEAROW db 14,VOLTORB @@ -26,19 +24,4 @@ Route10Mons: db 13,SANDSHREW db 17,SANDSHREW ENDC - - IF DEF(_YELLOW) - db 16,MAGNEMITE - db 18,RATTATA - db 18,MAGNEMITE - db 20,MAGNEMITE - db 17,NIDORAN_M - db 17,NIDORAN_F - db 22,MAGNEMITE - db 20,RATICATE - db 16,MACHOP - db 18,MACHOP - ENDC - db $00 - diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm index 66c52c20..9e4e3644 100755 --- a/data/wildPokemon/route11.asm +++ b/data/wildPokemon/route11.asm @@ -1,6 +1,5 @@ Route11Mons: db $0F - IF DEF(_RED) db 14,EKANS db 15,SPEAROW @@ -13,8 +12,7 @@ Route11Mons: db 11,DROWZEE db 15,DROWZEE ENDC - - IF DEF(_GREEN) || DEF(_BLUE) + IF DEF(_BLUE) db 14,SANDSHREW db 15,SPEAROW db 12,SANDSHREW @@ -26,19 +24,4 @@ Route11Mons: db 11,DROWZEE db 15,DROWZEE ENDC - - IF DEF(_YELLOW) - db 16,PIDGEY - db 15,RATTATA - db 18,PIDGEY - db 15,DROWZEE - db 17,RATTATA - db 17,DROWZEE - db 18,PIDGEOTTO - db 20,PIDGEOTTO - db 19,DROWZEE - db 17,RATICATE - ENDC - db $00 - diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index 9bb26a6d..45dfbc9d 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -1,7 +1,6 @@ Route12Mons: db $0F - - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,ODDISH db 25,PIDGEY db 23,PIDGEY @@ -12,10 +11,8 @@ Route12Mons: db 27,PIDGEY db 28,GLOOM db 30,GLOOM - db $00 ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,BELLSPROUT db 25,PIDGEY db 23,PIDGEY @@ -26,31 +23,5 @@ Route12Mons: db 27,PIDGEY db 28,WEEPINBELL db 30,WEEPINBELL - db $00 ENDC - - IF DEF(_YELLOW) - db 25,ODDISH - db 25,BELLSPROUT - db 28,PIDGEY - db 28,PIDGEOTTO - db 27,ODDISH - db 27,BELLSPROUT - db 29,GLOOM - db 29,WEEPINBELL - db 26,FARFETCHD - db 31,FARFETCHD - - db $03 - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWBRO - db 20,SLOWBRO - ENDC - + db $00 diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm index be8ce386..2a1a6cb5 100755 --- a/data/wildPokemon/route13.asm +++ b/data/wildPokemon/route13.asm @@ -1,5 +1,5 @@ Route13Mons: - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db $14 db 24,ODDISH db 25,PIDGEY @@ -11,10 +11,8 @@ Route13Mons: db 25,DITTO db 28,GLOOM db 30,GLOOM - db $00 ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db $14 db 24,BELLSPROUT db 25,PIDGEY @@ -26,32 +24,5 @@ Route13Mons: db 25,DITTO db 28,WEEPINBELL db 30,WEEPINBELL - db $00 ENDC - - IF DEF(_YELLOW) - db $0F - db 25,ODDISH - db 25,BELLSPROUT - db 28,PIDGEOTTO - db 28,PIDGEY - db 27,ODDISH - db 27,BELLSPROUT - db 29,GLOOM - db 29,WEEPINBELL - db 26,FARFETCHD - db 31,FARFETCHD - - db $03 - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWBRO - db 20,SLOWBRO - ENDC - + db $00 diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm index 999981af..aad5aa48 100755 --- a/data/wildPokemon/route14.asm +++ b/data/wildPokemon/route14.asm @@ -1,6 +1,6 @@ Route14Mons: db $0F - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,ODDISH db 26,PIDGEY db 23,DITTO @@ -12,8 +12,7 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,BELLSPROUT db 26,PIDGEY db 23,DITTO @@ -25,19 +24,4 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_YELLOW) - db 26,ODDISH - db 26,BELLSPROUT - db 24,VENONAT - db 30,PIDGEOTTO - db 28,ODDISH - db 28,BELLSPROUT - db 30,GLOOM - db 30,WEEPINBELL - db 27,VENONAT - db 30,VENOMOTH - ENDC - db $00 - diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm index d924052a..b4762230 100755 --- a/data/wildPokemon/route15.asm +++ b/data/wildPokemon/route15.asm @@ -1,6 +1,6 @@ Route15Mons: db $0F - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,ODDISH db 26,DITTO db 23,PIDGEY @@ -12,8 +12,7 @@ Route15Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,BELLSPROUT db 26,DITTO db 23,PIDGEY @@ -25,19 +24,4 @@ Route15Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_YELLOW) - db 26,ODDISH - db 26,BELLSPROUT - db 24,VENONAT - db 32,PIDGEOTTO - db 28,ODDISH - db 28,BELLSPROUT - db 30,GLOOM - db 30,WEEPINBELL - db 27,VENONAT - db 30,VENOMOTH - ENDC - db $00 - diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm index 468e3777..c2421c50 100755 --- a/data/wildPokemon/route16.asm +++ b/data/wildPokemon/route16.asm @@ -1,28 +1,13 @@ Route16Mons: db $19 - IF DEF(_YELLOW) - db 22,SPEAROW - db 22,DODUO - db 23,RATTATA - db 24,DODUO - db 24,RATTATA - db 26,DODUO - db 23,SPEAROW - db 24,FEAROW - db 25,RATICATE - db 26,RATICATE - ELSE - db 20,SPEAROW - db 22,SPEAROW - db 18,RATTATA - db 20,DODUO - db 20,RATTATA - db 18,DODUO - db 22,DODUO - db 22,RATTATA - db 23,RATICATE - db 25,RATICATE - ENDC - + db 20,SPEAROW + db 22,SPEAROW + db 18,RATTATA + db 20,DODUO + db 20,RATTATA + db 18,DODUO + db 22,DODUO + db 22,RATTATA + db 23,RATICATE + db 25,RATICATE db $00 - diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm index 36283a99..8dffd9a3 100755 --- a/data/wildPokemon/route17.asm +++ b/data/wildPokemon/route17.asm @@ -1,29 +1,13 @@ Route17Mons: db $19 - - IF DEF(_YELLOW) - db 26,DODUO - db 27,FEAROW - db 27,DODUO - db 28,DODUO - db 28,PONYTA - db 30,PONYTA - db 29,FEAROW - db 28,DODUO - db 32,PONYTA - db 29,DODRIO - ELSE - db 20,SPEAROW - db 22,SPEAROW - db 25,RATICATE - db 24,DODUO - db 27,RATICATE - db 26,DODUO - db 28,DODUO - db 29,RATICATE - db 25,FEAROW - db 27,FEAROW - ENDC - + db 20,SPEAROW + db 22,SPEAROW + db 25,RATICATE + db 24,DODUO + db 27,RATICATE + db 26,DODUO + db 28,DODUO + db 29,RATICATE + db 25,FEAROW + db 27,FEAROW db $00 - diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm index e16fc8ac..47bd247d 100755 --- a/data/wildPokemon/route18.asm +++ b/data/wildPokemon/route18.asm @@ -1,29 +1,13 @@ Route18Mons: db $19 - - IF DEF(_YELLOW) - db 22,SPEAROW - db 22,DODUO - db 23,RATTATA - db 24,DODUO - db 24,RATTATA - db 26,DODUO - db 23,SPEAROW - db 24,FEAROW - db 25,RATICATE - db 26,RATICATE - ELSE - db 20,SPEAROW - db 22,SPEAROW - db 25,RATICATE - db 24,DODUO - db 25,FEAROW - db 26,DODUO - db 28,DODUO - db 29,RATICATE - db 27,FEAROW - db 29,FEAROW - ENDC - + db 20,SPEAROW + db 22,SPEAROW + db 25,RATICATE + db 24,DODUO + db 25,FEAROW + db 26,DODUO + db 28,DODUO + db 29,RATICATE + db 27,FEAROW + db 29,FEAROW db $00 - diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index 8f9eb4e5..fb3a5e82 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -1,39 +1,24 @@ Route2Mons: db $19 - - IF DEF(_YELLOW) - db 3,RATTATA - db 3,PIDGEY - db 4,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,PIDGEY - db 6,NIDORAN_M - db 6,NIDORAN_F - db 7,PIDGEY - db 7,PIDGEY - ELSE - db 3,RATTATA - db 3,PIDGEY - db 4,PIDGEY - db 4,RATTATA - db 5,PIDGEY - if DEF(_RED) - db 3,WEEDLE - ENDC - if DEF(_BLUE) - db 3,CATERPIE - ENDC - db 2,RATTATA - db 5,RATTATA - if DEF(_RED) - db 4,WEEDLE - db 5,WEEDLE - ENDC - if DEF(_BLUE) - db 4,CATERPIE - db 5,CATERPIE - ENDC + db 3,RATTATA + db 3,PIDGEY + db 4,PIDGEY + db 4,RATTATA + db 5,PIDGEY + if DEF(_RED) + db 3,WEEDLE + ENDC + if DEF(_BLUE) + db 3,CATERPIE + ENDC + db 2,RATTATA + db 5,RATTATA + if DEF(_RED) + db 4,WEEDLE + db 5,WEEDLE + ENDC + if DEF(_BLUE) + db 4,CATERPIE + db 5,CATERPIE ENDC db $00 - diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm index 7017081d..3cc73ba0 100755 --- a/data/wildPokemon/route21.asm +++ b/data/wildPokemon/route21.asm @@ -1,30 +1,15 @@ Route21Mons: db $19 - - IF DEF(_YELLOW) - db 15,PIDGEY - db 13,RATTATA - db 13,PIDGEY - db 11,PIDGEY - db 17,PIDGEY - db 15,RATTATA - db 15,RATICATE - db 17,PIDGEOTTO - db 19,PIDGEOTTO - db 15,PIDGEOTTO - ELSE - db 21,RATTATA - db 23,PIDGEY - db 30,RATICATE - db 23,RATTATA - db 21,PIDGEY - db 30,PIDGEOTTO - db 32,PIDGEOTTO - db 28,TANGELA - db 30,TANGELA - db 32,TANGELA - ENDC - + db 21,RATTATA + db 23,PIDGEY + db 30,RATICATE + db 23,RATTATA + db 21,PIDGEY + db 30,PIDGEOTTO + db 32,PIDGEOTTO + db 28,TANGELA + db 30,TANGELA + db 32,TANGELA db $05 db 5,TENTACOOL db 10,TENTACOOL @@ -36,4 +21,3 @@ Route21Mons: db 30,TENTACOOL db 35,TENTACOOL db 40,TENTACOOL - diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm index 78c5631a..8a8f3fdb 100755 --- a/data/wildPokemon/route22.asm +++ b/data/wildPokemon/route22.asm @@ -1,6 +1,6 @@ Route22Mons: db $19 - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 3,RATTATA db 3,NIDORAN_M db 4,RATTATA @@ -12,7 +12,7 @@ Route22Mons: db 3,NIDORAN_F db 4,NIDORAN_F ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 3,RATTATA db 3,NIDORAN_F db 4,RATTATA @@ -37,4 +37,3 @@ Route22Mons: db 6,SPEAROW ENDC db $00 - diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm index 1320868c..a96a0d3c 100755 --- a/data/wildPokemon/route23.asm +++ b/data/wildPokemon/route23.asm @@ -1,39 +1,23 @@ Route23Mons: db $0A - - IF DEF(_YELLOW) - db 41,NIDORINO - db 41,NIDORINA - db 36,MANKEY - db 44,NIDORINO - db 44,NIDORINA - db 40,FEAROW - db 41,MANKEY - db 45,FEAROW - db 41,PRIMEAPE - db 46,PRIMEAPE - ELSE - IF DEF(_RED) - db 26,EKANS - ENDC - IF !DEF(_RED) - db 26,SANDSHREW - ENDC - db 33,DITTO - db 26,SPEAROW - db 38,FEAROW - db 38,DITTO - db 38,FEAROW - IF DEF(_RED) - db 41,ARBOK - ENDC - IF !DEF(_RED) - db 41,SANDSLASH - ENDC - db 43,DITTO - db 41,FEAROW - db 43,FEAROW + IF DEF(_RED) + db 26,EKANS ENDC - + IF !DEF(_RED) + db 26,SANDSHREW + ENDC + db 33,DITTO + db 26,SPEAROW + db 38,FEAROW + db 38,DITTO + db 38,FEAROW + IF DEF(_RED) + db 41,ARBOK + ENDC + IF !DEF(_RED) + db 41,SANDSLASH + ENDC + db 43,DITTO + db 41,FEAROW + db 43,FEAROW db $00 - diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm index d586927f..3a745f36 100755 --- a/data/wildPokemon/route24.asm +++ b/data/wildPokemon/route24.asm @@ -1,6 +1,5 @@ Route24Mons: db $19 - IF DEF(_RED) db 7,WEEDLE db 8,KAKUNA @@ -13,8 +12,7 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 7,CATERPIE db 8,METAPOD db 12,PIDGEY @@ -26,32 +24,4 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 7,CATERPIE - db 8,METAPOD - db 12,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 10,ABRA - db 14,ODDISH - db 13,PIDGEY - db 8,ABRA - db 12,ABRA - ENDC - - IF DEF(_YELLOW) - db 12,ODDISH - db 12,BELLSPROUT - db 13,PIDGEY - db 14,ODDISH - db 14,BELLSPROUT - db 15,PIDGEY - db 13,VENONAT - db 16,VENONAT - db 17,PIDGEY - db 17,PIDGEOTTO - ENDC - db $00 - diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm index 4609c7cd..4884fa64 100755 --- a/data/wildPokemon/route25.asm +++ b/data/wildPokemon/route25.asm @@ -1,6 +1,5 @@ Route25Mons: db $0F - IF DEF(_RED) db 8,WEEDLE db 9,KAKUNA @@ -13,8 +12,7 @@ Route25Mons: db 7,METAPOD db 8,CATERPIE ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 8,CATERPIE db 9,METAPOD db 13,PIDGEY @@ -26,32 +24,4 @@ Route25Mons: db 7,KAKUNA db 8,WEEDLE ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 8,CATERPIE - db 9,METAPOD - db 13,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 12,ABRA - db 14,ODDISH - db 10,ABRA - db 7,KAKUNA - db 8,WEEDLE - ENDC - - IF DEF(_YELLOW) - db 12,ODDISH - db 12,BELLSPROUT - db 13,PIDGEY - db 14,ODDISH - db 14,BELLSPROUT - db 15,PIDGEY - db 13,VENONAT - db 16,VENONAT - db 17,PIDGEY - db 17,PIDGEOTTO - ENDC - db $00 - diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm index fe7c5da9..dea820a4 100755 --- a/data/wildPokemon/route3.asm +++ b/data/wildPokemon/route3.asm @@ -1,27 +1,13 @@ Route3Mons: db $14 - IF DEF(_YELLOW) - db 8,SPEAROW - db 9,SPEAROW - db 9,MANKEY - db 10,SPEAROW - db 8,SANDSHREW - db 10,RATTATA - db 10,SANDSHREW - db 12,RATTATA - db 11,SPEAROW - db 12,SPEAROW - ELSE - db 6,PIDGEY - db 5,SPEAROW - db 7,PIDGEY - db 6,SPEAROW - db 7,SPEAROW - db 8,PIDGEY - db 8,SPEAROW - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - ENDC + db 6,PIDGEY + db 5,SPEAROW + db 7,PIDGEY + db 6,SPEAROW + db 7,SPEAROW + db 8,PIDGEY + db 8,SPEAROW + db 3,JIGGLYPUFF + db 5,JIGGLYPUFF + db 7,JIGGLYPUFF db $00 - diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm index 40c3b7b5..624d58de 100755 --- a/data/wildPokemon/route4.asm +++ b/data/wildPokemon/route4.asm @@ -1,6 +1,5 @@ Route4Mons: db $14 - IF DEF(_RED) db 10,RATTATA db 10,SPEAROW @@ -13,8 +12,7 @@ Route4Mons: db 8,EKANS db 12,EKANS ENDC - - IF DEF(_BLUE) || DEF(_GREEN) + IF DEF(_BLUE) db 10,RATTATA db 10,SPEAROW db 8,RATTATA @@ -26,19 +24,4 @@ Route4Mons: db 8,SANDSHREW db 12,SANDSHREW ENDC - - IF DEF(_YELLOW) - db 8,SPEAROW - db 9,SPEAROW - db 9,MANKEY - db 10,SPEAROW - db 8,SANDSHREW - db 10,RATTATA - db 10,SANDSHREW - db 12,RATTATA - db 11,SPEAROW - db 12,SPEAROW - ENDC - db $00 - diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm index aa67ca87..cb8c583b 100755 --- a/data/wildPokemon/route5.asm +++ b/data/wildPokemon/route5.asm @@ -1,6 +1,5 @@ Route5Mons: db $0F - IF DEF(_RED) db 13,ODDISH db 13,PIDGEY @@ -13,8 +12,7 @@ Route5Mons: db 14,MANKEY db 16,MANKEY ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 13,BELLSPROUT db 13,PIDGEY db 15,PIDGEY @@ -26,32 +24,4 @@ Route5Mons: db 14,MEOWTH db 16,MEOWTH ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - ENDC - - IF DEF(_YELLOW) - db 15,PIDGEY - db 14,RATTATA - db 7,ABRA - db 16,PIDGEY - db 16,RATTATA - db 17,PIDGEY - db 17,PIDGEOTTO - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - ENDC - db $00 - diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm index 86e0c05f..92512ffb 100755 --- a/data/wildPokemon/route6.asm +++ b/data/wildPokemon/route6.asm @@ -1,6 +1,5 @@ Route6Mons: db $0F - IF DEF(_RED) db 13,ODDISH db 13,PIDGEY @@ -12,10 +11,8 @@ Route6Mons: db 16,PIDGEY db 14,MANKEY db 16,MANKEY - db $00 ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 13,BELLSPROUT db 13,PIDGEY db 15,PIDGEY @@ -26,45 +23,5 @@ Route6Mons: db 16,PIDGEY db 14,MEOWTH db 16,MEOWTH - db $00 ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - db $00 - ENDC - - IF DEF(_YELLOW) - db 15,PIDGEY - db 14,RATTATA - db 7,ABRA - db 16,PIDGEY - db 16,RATTATA - db 17,PIDGEY - db 17,PIDGEOTTO - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - - db $03 - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,GOLDUCK - db 20,GOLDUCK - ENDC - + db $00 diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm index 505b632b..559c98ee 100755 --- a/data/wildPokemon/route7.asm +++ b/data/wildPokemon/route7.asm @@ -1,6 +1,5 @@ Route7Mons: db $0F - IF DEF(_RED) db 19,PIDGEY db 19,ODDISH @@ -13,8 +12,7 @@ Route7Mons: db 19,MANKEY db 20,MANKEY ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 19,PIDGEY db 19,BELLSPROUT db 17,MEOWTH @@ -26,32 +24,4 @@ Route7Mons: db 19,MEOWTH db 20,MEOWTH ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 19,PIDGEY - db 19,ODDISH - db 17,MEOWTH - db 22,ODDISH - db 22,PIDGEY - db 18,MEOWTH - db 18,GROWLITHE - db 20,GROWLITHE - db 19,MEOWTH - db 20,MEOWTH - ENDC - - IF DEF(_YELLOW) - db 20,PIDGEY - db 22,PIDGEY - db 20,RATTATA - db 15,ABRA - db 19,ABRA - db 24,PIDGEOTTO - db 26,ABRA - db 19,JIGGLYPUFF - db 24,JIGGLYPUFF - db 24,JIGGLYPUFF - ENDC - db $00 - diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm index 67905134..8a0bfa31 100755 --- a/data/wildPokemon/route8.asm +++ b/data/wildPokemon/route8.asm @@ -1,6 +1,5 @@ Route8Mons: db $0F - IF DEF(_RED) db 18,PIDGEY db 18,MANKEY @@ -13,8 +12,7 @@ Route8Mons: db 15,GROWLITHE db 18,GROWLITHE ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 18,PIDGEY db 18,MEOWTH db 17,SANDSHREW @@ -26,32 +24,4 @@ Route8Mons: db 15,VULPIX db 18,VULPIX ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 18,PIDGEY - db 18,MEOWTH - db 17,SANDSHREW - db 16,GROWLITHE - db 20,PIDGEY - db 20,MEOWTH - db 19,SANDSHREW - db 17,GROWLITHE - db 15,GROWLITHE - db 18,GROWLITHE - ENDC - - IF DEF(_YELLOW) - db 20,PIDGEY - db 22,PIDGEY - db 20,RATTATA - db 15,ABRA - db 19,ABRA - db 24,PIDGEOTTO - db 19,JIGGLYPUFF - db 24,JIGGLYPUFF - db 20,KADABRA - db 27,KADABRA - ENDC - db $00 - diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm index d563aa2b..716589b0 100755 --- a/data/wildPokemon/route9.asm +++ b/data/wildPokemon/route9.asm @@ -1,6 +1,5 @@ Route9Mons: db $0F - IF DEF(_RED) db 16,RATTATA db 16,SPEAROW @@ -13,8 +12,7 @@ Route9Mons: db 13,EKANS db 17,EKANS ENDC - - IF DEF(_GREEN) || DEF(_BLUE) + IF DEF(_BLUE) db 16,RATTATA db 16,SPEAROW db 14,RATTATA @@ -26,19 +24,4 @@ Route9Mons: db 13,SANDSHREW db 17,SANDSHREW ENDC - - IF DEF(_YELLOW) - db 16,NIDORAN_M - db 16,NIDORAN_F - db 18,RATTATA - db 18,NIDORAN_M - db 18,NIDORAN_F - db 17,SPEAROW - db 18,NIDORINO - db 18,NIDORINA - db 20,RATICATE - db 19,FEAROW - ENDC - db $00 - diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm index 3781af0e..3d77b6fe 100755 --- a/data/wildPokemon/safarizone1.asm +++ b/data/wildPokemon/safarizone1.asm @@ -1,6 +1,6 @@ ZoneMons1: db $1E - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,NIDORAN_M db 26,DODUO db 22,PARAS @@ -9,16 +9,10 @@ ZoneMons1: db 23,EXEGGCUTE db 24,NIDORAN_F db 25,PARASECT - IF DEF(_RED) - db 25,KANGASKHAN - ENDC - IF DEF(_JAPAN) && DEF(_BLUE) - db 25,LICKITUNG - ENDC + db 25,KANGASKHAN db 28,SCYTHER ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,NIDORAN_F db 26,DODUO db 22,PARAS @@ -30,19 +24,4 @@ ZoneMons1: db 25,KANGASKHAN db 28,PINSIR ENDC - - IF DEF(_YELLOW) - db 21,NIDORAN_M - db 29,NIDORAN_F - db 22,EXEGGCUTE - db 21,TAUROS - db 32,NIDORINA - db 19,CUBONE - db 26,EXEGGCUTE - db 24,MAROWAK - db 21,CHANSEY - db 15,SCYTHER - ENDC - db $00 - diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm index 5de4ad00..c1b6a547 100755 --- a/data/wildPokemon/safarizone2.asm +++ b/data/wildPokemon/safarizone2.asm @@ -1,48 +1,28 @@ ZoneMons2: db $1E - IF DEF(_YELLOW) - db 36,NIDORAN_M - db 14,NIDORAN_F - db 20,EXEGGCUTE - db 25,RHYHORN - db 23,NIDORINA - db 28,KANGASKHAN - db 16,CUBONE - db 33,KANGASKHAN - db 25,SCYTHER - db 15,PINSIR - ELSE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 22,NIDORAN_M - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 22,NIDORAN_F - ENDC - db 26,RHYHORN - db 23,PARAS - db 25,EXEGGCUTE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINO - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINA - ENDC - db 27,EXEGGCUTE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINA - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINO - ENDC - db 32,VENOMOTH - db 26,CHANSEY - IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 28,TAUROS - ENDC - IF (DEF(_JAPAN) && DEF(_BLUE)) - db 28,PINSIR - ENDC + IF DEF(_RED) + db 22,NIDORAN_M ENDC - + IF DEF(_BLUE) + db 22,NIDORAN_F + ENDC + db 26,RHYHORN + db 23,PARAS + db 25,EXEGGCUTE + IF DEF(_RED) + db 30,NIDORINO + ENDC + IF DEF(_BLUE) + db 30,NIDORINA + ENDC + db 27,EXEGGCUTE + IF DEF(_RED) + db 30,NIDORINA + ENDC + IF DEF(_BLUE) + db 30,NIDORINO + ENDC + db 32,VENOMOTH + db 26,CHANSEY + db 28,TAUROS db $00 - diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm index c13cd378..47b6a102 100755 --- a/data/wildPokemon/safarizone3.asm +++ b/data/wildPokemon/safarizone3.asm @@ -12,8 +12,7 @@ ZoneMons3: db 26,TAUROS db 28,KANGASKHAN ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 25,NIDORAN_F db 26,DODUO db 23,VENONAT @@ -25,32 +24,4 @@ ZoneMons3: db 26,TAUROS db 28,KANGASKHAN ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 25,NIDORAN_M - db 26,DODUO - db 23,VENONAT - db 24,EXEGGCUTE - db 33,NIDORINO - db 26,EXEGGCUTE - db 25,NIDORAN_F - db 31,VENOMOTH - db 26,PINSIR - db 28,LICKITUNG - ENDC - - IF DEF(_YELLOW) - db 29,NIDORAN_M - db 21,NIDORAN_F - db 22,EXEGGCUTE - db 21,TAUROS - db 32,NIDORINO - db 19,CUBONE - db 26,EXEGGCUTE - db 24,MAROWAK - db 25,PINSIR - db 27,TANGELA - ENDC - db $00 - diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm index 7b50e5b9..0cd5323a 100755 --- a/data/wildPokemon/safarizonecenter.asm +++ b/data/wildPokemon/safarizonecenter.asm @@ -12,8 +12,7 @@ ZoneMonsCenter: db 23,SCYTHER db 23,CHANSEY ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 22,NIDORAN_F db 25,RHYHORN db 22,VENONAT @@ -25,32 +24,4 @@ ZoneMonsCenter: db 23,PINSIR db 23,CHANSEY ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 22,NIDORAN_M - db 25,RHYHORN - db 22,VENONAT - db 24,EXEGGCUTE - db 31,NIDORINO - db 25,EXEGGCUTE - db 31,NIDORINA - db 30,PARASECT - db 23,SCYTHER - db 23,CHANSEY - ENDC - - IF DEF(_YELLOW) - db 14,NIDORAN_M - db 36,NIDORAN_F - db 24,EXEGGCUTE - db 20,RHYHORN - db 23,NIDORINO - db 27,PARASECT - db 27,PARAS - db 32,PARASECT - db 22,TANGELA - db 7,CHANSEY - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm index 45d0a707..3c431f9a 100755 --- a/data/wildPokemon/seafoamisland1.asm +++ b/data/wildPokemon/seafoamisland1.asm @@ -12,8 +12,7 @@ IslandMons1: db 28,SHELLDER db 38,GOLDUCK ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 30,SEEL db 30,PSYDUCK db 30,STARYU @@ -25,32 +24,4 @@ IslandMons1: db 28,STARYU db 38,SLOWBRO ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 30,SEEL - db 30,HORSEA - db 30,STARYU - db 30,KRABBY - db 28,KRABBY - db 21,ZUBAT - db 29,GOLBAT - db 28,SLOWPOKE - db 28,STARYU - db 38,SLOWBRO - ENDC - - IF DEF(_YELLOW) - db 18,ZUBAT - db 25,KRABBY - db 27,KRABBY - db 27,ZUBAT - db 36,ZUBAT - db 28,SLOWPOKE - db 30,SLOWPOKE - db 9,ZUBAT - db 27,GOLBAT - db 36,GOLBAT - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm index 3f6ef7b6..6f96f240 100755 --- a/data/wildPokemon/seafoamislandb1.asm +++ b/data/wildPokemon/seafoamislandb1.asm @@ -12,8 +12,7 @@ IslandMonsB1: db 38,DEWGONG db 37,SEADRA ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 30,SHELLDER db 30,KRABBY db 32,STARYU @@ -25,32 +24,4 @@ IslandMonsB1: db 38,DEWGONG db 37,KINGLER ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 30,SHELLDER - db 30,KRABBY - db 32,STARYU - db 32,KRABBY - db 28,HORSEA - db 30,SEEL - db 30,HORSEA - db 28,SEEL - db 38,DEWGONG - db 37,KINGLER - ENDC - - IF DEF(_YELLOW) - db 27,ZUBAT - db 26,KRABBY - db 36,ZUBAT - db 28,KRABBY - db 27,GOLBAT - db 29,SLOWPOKE - db 18,ZUBAT - db 28,KINGLER - db 22,SEEL - db 26,SEEL - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm index 5df1cca9..7191fea9 100755 --- a/data/wildPokemon/seafoamislandb2.asm +++ b/data/wildPokemon/seafoamislandb2.asm @@ -12,8 +12,7 @@ IslandMonsB2: db 30,GOLBAT db 37,SLOWBRO ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 30,SEEL db 30,PSYDUCK db 32,SEEL @@ -25,32 +24,4 @@ IslandMonsB2: db 30,GOLBAT db 37,GOLDUCK ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 30,SEEL - db 30,HORSEA - db 32,SEEL - db 32,HORSEA - db 28,KRABBY - db 30,SHELLDER - db 30,KRABBY - db 28,STARYU - db 30,GOLBAT - db 37,JYNX - ENDC - - IF DEF(_YELLOW) - db 27,ZUBAT - db 27,KRABBY - db 36,ZUBAT - db 27,GOLBAT - db 28,KINGLER - db 24,SEEL - db 29,KRABBY - db 36,GOLBAT - db 31,SLOWPOKE - db 31,SLOWBRO - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm index e8560c9a..9778c0e9 100755 --- a/data/wildPokemon/seafoamislandb3.asm +++ b/data/wildPokemon/seafoamislandb3.asm @@ -12,8 +12,7 @@ IslandMonsB3: db 39,SEADRA db 37,DEWGONG ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 31,PSYDUCK db 31,SEEL db 33,PSYDUCK @@ -25,44 +24,4 @@ IslandMonsB3: db 39,KINGLER db 37,DEWGONG ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 31,HORSEA - db 31,SEEL - db 33,HORSEA - db 33,SEEL - db 29,KRABBY - db 31,STARYU - db 31,KRABBY - db 29,STARYU - db 39,KINGLER - db 37,DEWGONG - ENDC - - IF DEF(_YELLOW) - db 27,GOLBAT - db 36,ZUBAT - db 29,KRABBY - db 27,ZUBAT - db 30,KINGLER - db 26,SEEL - db 31,KRABBY - db 30,SEEL - db 28,DEWGONG - db 32,DEWGONG - - db $05 - db 25,TENTACOOL - db 30,TENTACOOL - db 20,TENTACOOL - db 30,STARYU - db 35,TENTACOOL - db 30,STARYU - db 40,TENTACOOL - db 30,STARYU - db 30,STARYU - db 30,STARYU - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm index 7f8977d6..3948470b 100755 --- a/data/wildPokemon/seafoamislandb4.asm +++ b/data/wildPokemon/seafoamislandb4.asm @@ -12,8 +12,7 @@ IslandMonsB4: db 39,SLOWBRO db 32,GOLBAT ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 31,KRABBY db 31,STARYU db 33,KRABBY @@ -25,44 +24,4 @@ IslandMonsB4: db 39,GOLDUCK db 32,GOLBAT ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 31,KRABBY - db 31,STARYU - db 33,KRABBY - db 33,STARYU - db 29,HORSEA - db 31,SEEL - db 31,HORSEA - db 29,SEEL - db 39,JYNX - db 32,GOLBAT - ENDC - - IF DEF(_YELLOW) - db 36,GOLBAT - db 36,ZUBAT - db 30,KRABBY - db 32,KINGLER - db 28,SEEL - db 32,SEEL - db 27,GOLBAT - db 45,ZUBAT - db 30,DEWGONG - db 34,DEWGONG - - db $05 - db 25,TENTACOOL - db 30,TENTACOOL - db 20,TENTACOOL - db 30,STARYU - db 35,TENTACOOL - db 30,STARYU - db 40,TENTACOOL - db 30,STARYU - db 30,STARYU - db 30,STARYU - ENDC - db $00 - diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm index 504d32f1..70f680b7 100755 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/unknowndungeon1.asm @@ -1,38 +1,18 @@ DungeonMons1: db $0A - IF DEF(_YELLOW) - db 50,GOLBAT - db 55,GOLBAT - db 45,GRAVELER - db 55,GLOOM - db 55,WEEPINBELL + db 46,GOLBAT + db 46,HYPNO + db 46,MAGNETON + db 49,DODRIO + db 49,VENOMOTH + IF DEF(_RED) + db 52,ARBOK + ENDC + IF !DEF(_RED) db 52,SANDSLASH - db 54,VENOMOTH - db 54,PARASECT - db 55,DITTO - db 60,DITTO - ELSE - db 46,GOLBAT - db 46,HYPNO - db 46,MAGNETON - IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 49,DODRIO - ENDC - IF DEF(_JAPAN) && DEF(_BLUE) - db 49,RAPIDASH - ENDC - db 49,VENOMOTH - IF DEF(_RED) - db 52,ARBOK - ENDC - IF !DEF(_RED) - db 52,SANDSLASH - ENDC - db 49,KADABRA - db 52,PARASECT - db 53,RAICHU - db 53,DITTO ENDC - + db 49,KADABRA + db 52,PARASECT + db 53,RAICHU + db 53,DITTO db $00 - diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm index 9422f3a0..5afe55ac 100755 --- a/data/wildPokemon/unknowndungeon2.asm +++ b/data/wildPokemon/unknowndungeon2.asm @@ -1,33 +1,13 @@ DungeonMons2: db $0F - IF DEF(_YELLOW) - db 52,GOLBAT - db 57,GOLBAT - db 50,GRAVELER - db 56,SANDSLASH - db 50,RHYHORN - db 60,DITTO - db 58,GLOOM - db 58,WEEPINBELL - db 60,RHYDON - db 58,RHYDON - ELSE - db 51,DODRIO - db 51,VENOMOTH - db 51,KADABRA - db 52,RHYDON - IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) - db 52,MAROWAK - ENDC - IF (DEF(_BLUE) && DEF(_JAPAN)) - db 52,MAROWAK - ENDC - db 52,ELECTRODE - db 56,CHANSEY - db 54,WIGGLYTUFF - db 55,DITTO - db 60,DITTO - ENDC - + db 51,DODRIO + db 51,VENOMOTH + db 51,KADABRA + db 52,RHYDON + db 52,MAROWAK + db 52,ELECTRODE + db 56,CHANSEY + db 54,WIGGLYTUFF + db 55,DITTO + db 60,DITTO db $00 - diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm index 6a88edb2..245d5912 100755 --- a/data/wildPokemon/unknowndungeonb1.asm +++ b/data/wildPokemon/unknowndungeonb1.asm @@ -1,33 +1,18 @@ DungeonMonsB1: db $19 - IF DEF(_YELLOW) - db 54,GOLBAT - db 59,GOLBAT - db 55,GRAVELER - db 52,RHYHORN - db 62,RHYDON - db 60,DITTO - db 56,CHANSEY - db 65,DITTO - db 55,LICKITUNG - db 50,LICKITUNG - ELSE - db 55,RHYDON - db 55,MAROWAK - db 55,ELECTRODE - db 64,CHANSEY - db 64,PARASECT - db 64,RAICHU - IF DEF(_RED) - db 57,ARBOK - ENDC - IF DEF(_BLUE) || DEF(_GREEN) - db 57,SANDSLASH - ENDC - db 65,DITTO - db 63,DITTO - db 67,DITTO + db 55,RHYDON + db 55,MAROWAK + db 55,ELECTRODE + db 64,CHANSEY + db 64,PARASECT + db 64,RAICHU + IF DEF(_RED) + db 57,ARBOK ENDC - + IF DEF(_BLUE) + db 57,SANDSLASH + ENDC + db 65,DITTO + db 63,DITTO + db 67,DITTO db $00 - diff --git a/data/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm index 98914a91..60aae31a 100755 --- a/data/wildPokemon/victoryroad1.asm +++ b/data/wildPokemon/victoryroad1.asm @@ -1,29 +1,13 @@ PlateauMons1: db $0F - - IF DEF(_YELLOW) - db 26,GEODUDE - db 31,GEODUDE - db 36,GEODUDE - db 39,ZUBAT - db 44,ZUBAT - db 41,GEODUDE - db 43,ONIX - db 45,ONIX - db 41,GRAVELER - db 47,GRAVELER - ELSE - db 24,MACHOP - db 26,GEODUDE - db 22,ZUBAT - db 36,ONIX - db 39,ONIX - db 42,ONIX - db 41,GRAVELER - db 41,GOLBAT - db 42,MACHOKE - db 43,MAROWAK - ENDC - + db 24,MACHOP + db 26,GEODUDE + db 22,ZUBAT + db 36,ONIX + db 39,ONIX + db 42,ONIX + db 41,GRAVELER + db 41,GOLBAT + db 42,MACHOKE + db 43,MAROWAK db $00 - diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm index ffe117bc..580d644d 100755 --- a/data/wildPokemon/victoryroad2.asm +++ b/data/wildPokemon/victoryroad2.asm @@ -1,29 +1,13 @@ PlateauMons2: db $0A - - IF DEF(_YELLOW) - db 31,GEODUDE - db 36,GEODUDE - db 41,GEODUDE - db 44,ZUBAT - db 39,GOLBAT - db 44,GRAVELER - db 45,ONIX - db 47,ONIX - db 39,MACHOKE - db 42,MACHOKE - ELSE - db 22,MACHOP - db 24,GEODUDE - db 26,ZUBAT - db 36,ONIX - db 39,ONIX - db 42,ONIX - db 41,MACHOKE - db 40,GOLBAT - db 40,MAROWAK - db 43,GRAVELER - ENDC - + db 22,MACHOP + db 24,GEODUDE + db 26,ZUBAT + db 36,ONIX + db 39,ONIX + db 42,ONIX + db 41,MACHOKE + db 40,GOLBAT + db 40,MAROWAK + db 43,GRAVELER db $00 - diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm index 7c1b2c1c..80d7ef3e 100755 --- a/data/wildPokemon/victoryroad3.asm +++ b/data/wildPokemon/victoryroad3.asm @@ -1,29 +1,13 @@ PlateauMons3: db $0F - - IF DEF(_YELLOW) - db 36,GEODUDE - db 44,GOLBAT - db 41,GEODUDE - db 49,ONIX - db 46,GEODUDE - db 41,GRAVELER - db 42,MACHOKE - db 45,MACHOKE - db 47,GRAVELER - db 47,GRAVELER - ELSE - db 24,MACHOP - db 26,GEODUDE - db 22,ZUBAT - db 42,ONIX - db 40,VENOMOTH - db 45,ONIX - db 43,GRAVELER - db 41,GOLBAT - db 42,MACHOKE - db 45,MACHOKE - ENDC - + db 24,MACHOP + db 26,GEODUDE + db 22,ZUBAT + db 42,ONIX + db 40,VENOMOTH + db 45,ONIX + db 43,GRAVELER + db 41,GOLBAT + db 42,MACHOKE + db 45,MACHOKE db $00 - diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm index f6e00ac3..ae9a5a70 100755 --- a/data/wildPokemon/viridianforest.asm +++ b/data/wildPokemon/viridianforest.asm @@ -1,43 +1,25 @@ ForestMons: - IF DEF(_YELLOW) - db $19 - db 3,CATERPIE + db $08 + IF DEF(_RED) + db 4,WEEDLE + db 5,KAKUNA + db 3,WEEDLE + db 5,WEEDLE + db 4,KAKUNA + db 6,KAKUNA db 4,METAPOD + db 3,CATERPIE + ENDC + IF DEF(_BLUE) db 4,CATERPIE + db 5,METAPOD + db 3,CATERPIE db 5,CATERPIE - db 4,PIDGEY - db 6,PIDGEY - db 6,CATERPIE + db 4,METAPOD db 6,METAPOD - db 8,PIDGEY - db 9,PIDGEOTTO - ELSE - db $08 - IF DEF(_RED) - db 4,WEEDLE - db 5,KAKUNA - db 3,WEEDLE - db 5,WEEDLE - db 4,KAKUNA - db 6,KAKUNA - db 4,METAPOD - db 3,CATERPIE - ENDC - IF DEF(_BLUE) || DEF(_GREEN) - db 4,CATERPIE - db 5,METAPOD - db 3,CATERPIE - db 5,CATERPIE - db 4,METAPOD - db 6,METAPOD - db 4,KAKUNA - db 3,WEEDLE - ENDC - - db 3,PIKACHU - db 5,PIKACHU + db 4,KAKUNA + db 3,WEEDLE ENDC - - + db 3,PIKACHU + db 5,PIKACHU db $00 - diff --git a/data/wildPokemon/waterpokemon.asm b/data/wildPokemon/waterpokemon.asm index ef2d39ea..07c6a187 100755 --- a/data/wildPokemon/waterpokemon.asm +++ b/data/wildPokemon/waterpokemon.asm @@ -1,6 +1,5 @@ WaterMons: db $00 - db $05 db 5,TENTACOOL db 10,TENTACOOL @@ -12,4 +11,3 @@ WaterMons: db 30,TENTACOOL db 35,TENTACOOL db 40,TENTACOOL - -- cgit v1.3.1-sl0p From 8c5bf5746447ebb51fbf3aa2d688f410558e2a4c Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 17 Feb 2016 15:28:39 -0500 Subject: apt-cyg died again --- INSTALL.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index c9696f72..bd1ae71d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -43,14 +43,13 @@ In **Terminal**, run: To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the default settings. +In the installer, select the following packages: `make` `git` `python` `gettext` + Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/). Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. In the **Cygwin terminal**: - install $(lynx -source rawgit.com/transcode-open/apt-cyg/master/apt-cyg) /bin - apt-cyg install make git python gettext - lynx -source bootstrap.pypa.io/get-pip.py | python pip install pypng -- cgit v1.3.1-sl0p From b852fe5b421fecd2b75c85bf5da926dd878434c0 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 17 Feb 2016 15:33:01 -0500 Subject: Use rgbasm -D in the makefile. --- Makefile | 77 +++++++++++++++++++++----------------------------------- blue.asm | 2 -- blue/audio.asm | 2 -- blue/main.asm | 2 -- blue/text.asm | 2 -- blue/wram.asm | 2 -- constants.asm | 1 + red.asm | 2 -- red/audio.asm | 2 -- red/main.asm | 2 -- red/text.asm | 2 -- red/wram.asm | 2 -- text.asm | 1 + yellow.asm | 4 --- yellow/audio.asm | 2 -- yellow/main.asm | 2 -- yellow/text.asm | 2 -- yellow/wram.asm | 2 -- 18 files changed, 31 insertions(+), 80 deletions(-) delete mode 100644 blue.asm delete mode 100644 blue/audio.asm delete mode 100644 blue/main.asm delete mode 100644 blue/text.asm delete mode 100644 blue/wram.asm delete mode 100644 red.asm delete mode 100644 red/audio.asm delete mode 100644 red/main.asm delete mode 100644 red/text.asm delete mode 100644 red/wram.asm delete mode 100644 yellow.asm delete mode 100644 yellow/audio.asm delete mode 100644 yellow/main.asm delete mode 100644 yellow/text.asm delete mode 100644 yellow/wram.asm diff --git a/Makefile b/Makefile index acca2ed0..cf3983f4 100644 --- a/Makefile +++ b/Makefile @@ -1,48 +1,37 @@ -# python 2.7 PYTHON := python - -# md5sum -c is used to compare rom hashes. The options may vary across platforms. MD5 := md5sum -c --quiet +2bpp := $(PYTHON) extras/pokemontools/gfx.py 2bpp +1bpp := $(PYTHON) extras/pokemontools/gfx.py 1bpp +pic := $(PYTHON) extras/pokemontools/pic.py compress +includes := $(PYTHON) extras/pokemontools/scan_includes.py + +base_obj := \ + audio.o \ + main.o \ + text.o \ + wram.o + +red_obj := $(base_obj:.o=_red.o) +blue_obj := $(base_obj:.o=_blue.o) +all_obj := $(red_obj) $(blue_obj) + +$(foreach obj, $(base_obj:.o=), \ + $(eval $(obj)_dep := $(shell $(includes) $(obj).asm)) \ +) -# Clear the default suffixes. .SUFFIXES: .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic - -# Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: - # Suppress annoying intermediate file deletion messages. .PRECIOUS: %.2bpp - .PHONY: all clean red blue compare - -poketools := extras/pokemontools -gfx := $(PYTHON) $(poketools)/gfx.py -2bpp := $(gfx) 2bpp -1bpp := $(gfx) 1bpp -pic := $(PYTHON) $(poketools)/pic.py compress -includes := $(PYTHON) $(poketools)/scan_includes.py - -versions := red blue - -# Collect file dependencies for objects in red/ and blue/. -$(foreach ver, $(versions), \ - $(eval $(ver)_asm := $(shell find $(ver) -iname '*.asm')) \ - $(eval $(ver)_obj := $($(ver)_asm:.asm=.o)) \ - $(eval all_obj += $($(ver)_obj)) \ -) -$(foreach obj, $(all_obj), \ - $(eval $(obj:.o=)_dep := $(shell $(includes) $(obj:.o=.asm))) \ -) - - roms := pokered.gbc pokeblue.gbc -all: $(roms) -red: pokered.gbc -blue: pokeblue.gbc +all: $(roms) +red: pokered.gbc +blue: pokeblue.gbc # For contributors to make sure a change didn't affect the contents of the rom. compare: red blue @@ -52,29 +41,21 @@ clean: rm -f $(roms) $(all_obj) $(roms:.gbc=.sym) find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + +%.asm: ; +$(red_obj): %_red.o: %.asm $$(%_dep) + rgbasm -D "_RED" -h -o $@ $*.asm +$(blue_obj): %_blue.o: %.asm $$(%_dep) + rgbasm -D "_BLUE" -h -o $@ $*.asm -# Don't fix halts. -asm_opt = -h - -# Make a symfile for debugging. -link_opt = -n poke$*.sym - -# Header options for rgbfix. dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 red_opt = $(dmg_opt) -t "POKEMON RED" blue_opt = $(dmg_opt) -t "POKEMON BLUE" +poke%.gbc: $$(%_obj) + rgblink -n poke$*.sym -o $@ $^ + rgbfix $($*_opt) $@ %.png: ; %.2bpp: %.png ; @$(2bpp) $< %.1bpp: %.png ; @$(1bpp) $< %.pic: %.2bpp ; @$(pic) $< - -# Assemble source files into objects. -$(all_obj): $$*.asm $$($$*_dep) - rgbasm $(asm_opt) -o $@ $*.asm - -# Link objects to produce a rom. -poke%.gbc: $$(%_obj) - rgblink $(link_opt) -o $@ $^ - rgbfix $($*_opt) $@ diff --git a/blue.asm b/blue.asm deleted file mode 100644 index c8c50a5d..00000000 --- a/blue.asm +++ /dev/null @@ -1,2 +0,0 @@ -_BLUE EQU 1 -INCLUDE "charmap.asm" diff --git a/blue/audio.asm b/blue/audio.asm deleted file mode 100644 index 53e37a2d..00000000 --- a/blue/audio.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "blue.asm" -INCLUDE "audio.asm" diff --git a/blue/main.asm b/blue/main.asm deleted file mode 100644 index 3fcef980..00000000 --- a/blue/main.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "blue.asm" -INCLUDE "main.asm" diff --git a/blue/text.asm b/blue/text.asm deleted file mode 100644 index ec6d7203..00000000 --- a/blue/text.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "blue.asm" -INCLUDE "text.asm" diff --git a/blue/wram.asm b/blue/wram.asm deleted file mode 100644 index 70292177..00000000 --- a/blue/wram.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "blue.asm" -INCLUDE "wram.asm" diff --git a/constants.asm b/constants.asm index 090799f9..9f1491c8 100644 --- a/constants.asm +++ b/constants.asm @@ -1,4 +1,5 @@ INCLUDE "macros.asm" +INCLUDE "charmap.asm" INCLUDE "hram.asm" INCLUDE "vram.asm" diff --git a/red.asm b/red.asm deleted file mode 100644 index 901a611a..00000000 --- a/red.asm +++ /dev/null @@ -1,2 +0,0 @@ -_RED EQU 1 -INCLUDE "charmap.asm" diff --git a/red/audio.asm b/red/audio.asm deleted file mode 100644 index 6c90a7c1..00000000 --- a/red/audio.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "red.asm" -INCLUDE "audio.asm" diff --git a/red/main.asm b/red/main.asm deleted file mode 100644 index ff8de04f..00000000 --- a/red/main.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "red.asm" -INCLUDE "main.asm" diff --git a/red/text.asm b/red/text.asm deleted file mode 100644 index d5d571d7..00000000 --- a/red/text.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "red.asm" -INCLUDE "text.asm" diff --git a/red/wram.asm b/red/wram.asm deleted file mode 100644 index 68c3c803..00000000 --- a/red/wram.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "red.asm" -INCLUDE "wram.asm" diff --git a/text.asm b/text.asm index 6555c185..d88bc409 100644 --- a/text.asm +++ b/text.asm @@ -15,6 +15,7 @@ POKEDEX_TEXT EQU TEXT_11 + 1 MOVE_NAMES EQU POKEDEX_TEXT + 1 INCLUDE "macros.asm" +INCLUDE "charmap.asm" INCLUDE "hram.asm" diff --git a/yellow.asm b/yellow.asm deleted file mode 100644 index 3edffe01..00000000 --- a/yellow.asm +++ /dev/null @@ -1,4 +0,0 @@ -_YELLOW EQU 1 -_OPTION_BEACH_HOUSE EQU 1 -_OPTION_LOWCOST_SAFARI EQU 1 -INCLUDE "charmap.asm" diff --git a/yellow/audio.asm b/yellow/audio.asm deleted file mode 100644 index e94c7db5..00000000 --- a/yellow/audio.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "yellow.asm" -INCLUDE "audio.asm" diff --git a/yellow/main.asm b/yellow/main.asm deleted file mode 100644 index 36c88720..00000000 --- a/yellow/main.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "yellow.asm" -INCLUDE "main.asm" diff --git a/yellow/text.asm b/yellow/text.asm deleted file mode 100644 index a84a633d..00000000 --- a/yellow/text.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "yellow.asm" -INCLUDE "text.asm" diff --git a/yellow/wram.asm b/yellow/wram.asm deleted file mode 100644 index c0b7f781..00000000 --- a/yellow/wram.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "yellow.asm" -INCLUDE "wram.asm" -- cgit v1.3.1-sl0p From 89e07d0d565fd382440bb3311e07da49b60a0810 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 17 Feb 2016 16:21:23 -0500 Subject: Bump extras. --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras b/extras index 698b0fc7..9644160b 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 698b0fc7e63d3dadf07247015e230bce145cc500 +Subproject commit 9644160b87e706f3a6ae20fe09e9c469f628c06d -- cgit v1.3.1-sl0p From af6fa345d689844429d20df9a18f6ae298733140 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 17 Feb 2016 16:34:50 -0500 Subject: Bump extras so that pypng doesn't need to be installed. --- INSTALL.md | 7 +------ extras | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index bd1ae71d..9bc30d6c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,7 +1,6 @@ # Linux - sudo apt-get install make gcc bison git python python-pip - sudo pip install pypng + sudo apt-get install make gcc bison git python git clone https://github.com/bentley/rgbds cd rgbds @@ -26,7 +25,6 @@ To build them individually: In **Terminal**, run: xcode-select --install - sudo easy_install pypng git clone https://github.com/bentley/rgbds cd rgbds @@ -50,9 +48,6 @@ Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\ In the **Cygwin terminal**: - lynx -source bootstrap.pypa.io/get-pip.py | python - pip install pypng - git clone --recursive https://github.com/pret/pokered cd pokered diff --git a/extras b/extras index 9644160b..68edf51f 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 9644160b87e706f3a6ae20fe09e9c469f628c06d +Subproject commit 68edf51f1070b056c281471242220f9c6142e1b6 -- cgit v1.3.1-sl0p From 213f6dfc98f6865131a6c8ba1a37ca002e752868 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 20 Feb 2016 13:54:52 -0800 Subject: Remove hardcoded values for CopyData in battle core. --- engine/battle/core.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c5c3774f..ac808a34 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1727,7 +1727,7 @@ LoadBattleMonFromParty: ; 3cba6 (f:4ba6) ld bc, NUM_MOVES call CopyData ld de, wBattleMonLevel - ld bc, $b + ld bc, wBattleMonPP - wBattleMonLevel call CopyData ld a, [wBattleMonSpecies2] ld [wd0b5], a @@ -1771,7 +1771,7 @@ LoadEnemyMonFromParty: ; 3cc13 (f:4c13) ld bc, NUM_MOVES call CopyData ld de, wEnemyMonLevel - ld bc, $b + ld bc, wEnemyMonPP - wEnemyMonLevel call CopyData ld a, [wEnemyMonSpecies] ld [wd0b5], a @@ -1913,11 +1913,11 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) call PlaceString ld hl, wBattleMonSpecies ld de, wLoadedMon - ld bc, $c + ld bc, wBattleMonDVs - wBattleMonSpecies call CopyData ld hl, wBattleMonLevel ld de, wLoadedMonLevel - ld bc, $b + ld bc, wBattleMonPP - wBattleMonLevel call CopyData coord hl, 14, 8 push hl -- cgit v1.3.1-sl0p From 6de584fe6601785a82ed59888ee70b8a2e5af974 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 21 Feb 2016 12:59:33 -0800 Subject: Remove hardcoded length values in items.asm --- engine/items/items.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/items/items.asm b/engine/items/items.asm index 55dcb53e..1dd0a6f7 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -863,7 +863,7 @@ ItemUseMedicine: ; dabb (3:5abb) jr nc,.healHP ; if it's a Full Restore or one of the potions ; fall through if it's one of the status-specifc healing items .cureStatusAilment - ld bc,4 + ld bc,wPartyMon1Status - wPartyMon1 add hl,bc ; hl now points to status ld a,[wcf91] lb bc, ANTIDOTE_MSG, 1 << PSN @@ -2039,7 +2039,7 @@ ItemUsePPRestore: ; e31e (3:631e) cp a,ETHER jr nc,.useEther ; if Ether or Max Ether .usePPUp - ld bc,21 + ld bc,wPartyMon1PP - wPartyMon1Moves add hl,bc ld a,[hl] ; move PP cp a,3 << 6 ; have 3 PP Ups already been used? -- cgit v1.3.1-sl0p From 6057f285ad1a930315d1a45fa3d1aa08efe6801d Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 14 Mar 2016 21:23:49 -0400 Subject: Add a farcall alias. --- macros.asm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/macros.asm b/macros.asm index 9efb69e5..a13a3a12 100644 --- a/macros.asm +++ b/macros.asm @@ -41,6 +41,8 @@ homecall: MACRO ld [MBC1RomBank], a ENDM +farcall EQUS "callba" + callba: MACRO ld b, BANK(\1) ld hl, \1 -- cgit v1.3.1-sl0p From 3fd678769231b76c17e4aab2f306892bd6988dc8 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Tue, 22 Mar 2016 00:10:23 -0600 Subject: Clean up more Yellow ifdefs. --- data/baseStats/alakazam.asm | 9 +-- data/baseStats/butterfree.asm | 4 - data/baseStats/chansey.asm | 6 +- data/baseStats/charizard.asm | 4 - data/baseStats/diglett.asm | 4 - data/baseStats/dugtrio.asm | 4 - data/baseStats/eevee.asm | 6 +- data/baseStats/flareon.asm | 6 +- data/baseStats/gyarados.asm | 7 -- data/baseStats/jolteon.asm | 6 +- data/baseStats/kadabra.asm | 9 +-- data/baseStats/marowak.asm | 12 +-- data/baseStats/primeape.asm | 7 +- data/baseStats/vaporeon.asm | 6 +- data/baseStats/venomoth.asm | 9 +-- data/baseStats/venonat.asm | 7 -- data/trades.asm | 13 ---- data/trainer_moves.asm | 165 ------------------------------------------ data/wildPokemon/route22.asm | 12 --- engine/battle/animations.asm | 3 - engine/battle/core.asm | 4 - engine/menu/bills_pc.asm | 3 - engine/menu/pokedex.asm | 3 - engine/oak_speech2.asm | 22 ------ engine/slot_machine.asm | 3 - 25 files changed, 15 insertions(+), 319 deletions(-) diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index 6762eb83..c20b6c41 100644 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -13,13 +13,8 @@ dw AlakazamPicFront dw AlakazamPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - db KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db CONFUSION +db DISABLE db 0 db 3 ; growth rate ; learnset diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index 75a0ee02..c0fb5f6c 100644 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -24,9 +24,5 @@ db 0 ; growth rate tmlearn 29,30,31,32 tmlearn 33,34,39 tmlearn 44,46 -IF DEF(_YELLOW) - tmlearn 50,55 -ELSE tmlearn 50 -ENDC db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index d9b8513d..434b1c26 100644 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -13,11 +13,7 @@ dw ChanseyPicFront dw ChanseyPicBack ; attacks known at lvl 0 db POUND -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db DOUBLESLAP -ENDC +db DOUBLESLAP db 0 db 0 db 4 ; growth rate diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index ea978159..2479a60c 100644 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -24,9 +24,5 @@ db 3 ; growth rate tmlearn 26,27,28,31,32 tmlearn 33,34,38,39,40 tmlearn 44 -IF DEF(_YELLOW) - tmlearn 50,51,52,54 -ELSE tmlearn 50,51,54 -ENDC db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index 173dfa3d..8ef6e381 100644 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -24,9 +24,5 @@ db 0 ; growth rate tmlearn 26,27,28,31,32 tmlearn 34 tmlearn 44,48 -IF DEF(_YELLOW) - tmlearn 50,51 -ELSE tmlearn 50 -ENDC db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index b70b5383..c763680f 100644 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -24,9 +24,5 @@ db 0 ; growth rate tmlearn 26,27,28,31,32 tmlearn 34 tmlearn 44,48 -IF DEF(_YELLOW) - tmlearn 50,51 -ELSE tmlearn 50 -ENDC db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 0fa869fe..51e36621 100644 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -13,11 +13,7 @@ dw EeveePicFront dw EeveePicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db 0 db 0 db 0 ; growth rate diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index c6c0c060..70621a6a 100644 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -13,11 +13,7 @@ dw FlareonPicFront dw FlareonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db EMBER db 0 ; growth rate diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index 21214d0b..6bfc34a0 100644 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -12,17 +12,10 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions dw GyaradosPicFront dw GyaradosPicBack ; attacks known at lvl 0 -IF DEF(_YELLOW) -db TACKLE -db 0 -db 0 -db 0 -ELSE db BITE db DRAGON_RAGE db LEER db HYDRO_PUMP -ENDC db 5 ; growth rate ; learnset tmlearn 6,8 diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index eb0bf305..b33d6327 100644 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -13,11 +13,7 @@ dw JolteonPicFront dw JolteonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db THUNDERSHOCK db 0 ; growth rate diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index ad4ac7f7..472cc4c5 100644 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -13,13 +13,8 @@ dw KadabraPicFront dw KadabraPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - DB KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db CONFUSION +db DISABLE db 0 db 3 ; growth rate ; learnset diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 152b4aaf..3b90dbb1 100644 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -13,15 +13,9 @@ dw MarowakPicFront dw MarowakPicBack ; attacks known at lvl 0 db BONE_CLUB -IF DEF(_YELLOW) - db TAIL_WHIP - db 0 - db 0 -ELSE - db GROWL - db LEER - db FOCUS_ENERGY -ENDC +db GROWL +db LEER +db FOCUS_ENERGY db 0 ; growth rate ; learnset tmlearn 1,5,6,8 diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index 389aa7f7..659edefd 100644 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -13,14 +13,9 @@ dw PrimeapePicFront dw PrimeapePicBack ; attacks known at lvl 0 db SCRATCH -IF !DEF(_YELLOW) - db LEER -ENDC +db LEER db KARATE_CHOP db FURY_SWIPES -IF DEF(_YELLOW) - db LOW_KICK -ENDC db 0 ; growth rate ; learnset tmlearn 1,5,6,8 diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index 7243a39f..e22b3185 100644 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -13,11 +13,7 @@ dw VaporeonPicFront dw VaporeonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db WATER_GUN db 0 ; growth rate diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index 01a6c3d0..7a5bd981 100644 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -14,13 +14,8 @@ dw VenomothPicBack ; attacks known at lvl 0 db TACKLE db DISABLE -IF DEF(_YELLOW) - db SUPERSONIC - db CONFUSION -ELSE - db POISONPOWDER - db LEECH_LIFE -ENDC +db POISONPOWDER +db LEECH_LIFE db 0 ; growth rate ; learnset tmlearn 2,4,6 diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index bc643c77..aeadc6cd 100644 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -21,15 +21,8 @@ db 0 ; growth rate tmlearn 6 tmlearn 9,10 tmlearn 20,21,22 -IF DEF(_YELLOW) - tmlearn 29,30,31,32 - tmlearn 33,34,39 - tmlearn 44,46 - tmlearn 50,55 -ELSE tmlearn 29,31,32 tmlearn 33,34 tmlearn 44,46 tmlearn 50 -ENDC db 0 ; padding diff --git a/data/trades.asm b/data/trades.asm index 274b0297..e7f71233 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,17 +1,5 @@ TradeMons: ; 71b7b (1c:5b7b) ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total -IF DEF(_YELLOW) - db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" - db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" - db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@" - db KANGASKHAN,MUK, 0,"STICKY@@@@@" - db MEW, MEW, 2,"BART@@@@@@@" - db TANGELA, PARASECT, 0,"SPIKE@@@@@@" - db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@" - db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@" - db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@" - db CUBONE, MACHOKE, 2,"RICKY@@@@@@" -ELSE db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" db ABRA, MR_MIME, 0,"MARCEL@@@@@" db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" @@ -22,4 +10,3 @@ ELSE db RAICHU, ELECTRODE,1,"DORIS@@@@@@" db VENONAT, TANGELA, 2,"CRINKLES@@@" db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@" -ENDC diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm index 518dab42..a42364af 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -1,4 +1,3 @@ -IF !DEF(YELLOW) LoneMoves: ; 39d22 (e:5d22) ; these are used for gym leaders. ; this is not automatic! you have to write the number you want to wLoneAttackNo @@ -31,167 +30,3 @@ TeamMoves: ; 39d32 (e:5d32) db AGATHA,TOXIC db LANCE,BARRIER db $FF - -ELSE -; yellow has its own format. - -; entry ≔ trainerclass, trainerid, moveset+, 0 -; moveset ≔ partymon, partymon'smove, moveid - -LoneMoves: -TeamMoves: - db BUG_CATCHER,$f - db 2,2,TACKLE - db 2,3,STRING_SHOT - db 0 - - db YOUNGSTER,$e - db 1,4,FISSURE - db 0 - - db BROCK,$1 - db 2,3,BIND - db 2,4,BIDE - db 0 - - db MISTY,$1 - db 2,4,BUBBLEBEAM - db 0 - - db LT_SURGE,$1 - db 1,1,THUNDERBOLT - db 1,2,MEGA_PUNCH - db 1,3,MEGA_KICK - db 1,4,GROWL - db 0 - - db ERIKA,$1 - db 1,3,MEGA_DRAIN - db 2,1,RAZOR_LEAF - db 3,1,PETAL_DANCE - db 0 - - db KOGA,$1 - db 1,1,TOXIC - db 1,2,TACKLE - db 2,1,TOXIC - db 2,3,SUPERSONIC - db 3,1,TOXIC - db 3,2,DOUBLE_EDGE - db 4,1,LEECH_LIFE - db 4,2,DOUBLE_TEAM - db 4,3,PSYCHIC_M - db 4,4,TOXIC - db 0 - - db BLAINE,$1 - db 1,1,FLAMETHROWER - db 1,4,CONFUSE_RAY - db 3,1,FLAMETHROWER - db 3,2,FIRE_BLAST - db 3,3,REFLECT - db 0 - - db SABRINA,$1 - db 1,1,FLASH - db 2,1,KINESIS - db 2,4,PSYWAVE - db 3,1,PSYWAVE - db 0 - - db GIOVANNI,$3 - db 1,3,FISSURE - db 2,2,DOUBLE_TEAM - db 3,1,EARTHQUAKE - db 3,3,THUNDER - db 4,1,EARTHQUAKE - db 4,2,LEER - db 4,3,THUNDER - db 5,1,ROCK_SLIDE - db 5,4,EARTHQUAKE - db 0 - - db LORELEI,$1 - db 1,1,BUBBLEBEAM - db 2,3,ICE_BEAM - db 3,1,PSYCHIC_M - db 3,2,SURF - db 4,3,LOVELY_KISS - db 5,3,BLIZZARD - db 0 - - db BRUNO,$1 - db 1,1,ROCK_SLIDE - db 1,2,SCREECH - db 1,4,DIG - db 2,3,FIRE_PUNCH - db 2,4,DOUBLE_TEAM - db 3,1,DOUBLE_KICK - db 3,2,MEGA_KICK - db 3,4,DOUBLE_TEAM - db 4,1,ROCK_SLIDE - db 4,2,SCREECH - db 4,4,EARTHQUAKE - db 5,2,KARATE_CHOP - db 5,3,STRENGTH - db 0 - - db AGATHA,$1 - db 1,2,SUBSTITUTE - db 1,3,LICK - db 1,4,MEGA_DRAIN - db 2,2,TOXIC - db 2,4,LEECH_LIFE - db 3,2,LICK - db 4,1,WRAP - db 5,2,PSYCHIC_M - db 0 - - db LANCE,$1 - db 1,1,DRAGON_RAGE - db 2,1,THUNDER_WAVE - db 2,3,THUNDERBOLT - db 3,1,BUBBLEBEAM - db 3,2,WRAP - db 3,3,ICE_BEAM - db 4,1,WING_ATTACK - db 4,2,SWIFT - db 4,3,FLY - db 5,1,BLIZZARD - db 5,2,FIRE_BLAST - db 5,3,THUNDER - db 0 - - db SONY3,$1 - db 1,3,EARTHQUAKE - db 2,4,KINESIS - db 3,4,LEECH_SEED - db 4,1,ICE_BEAM - db 5,1,CONFUSE_RAY - db 5,4,FIRE_SPIN - db 6,3,QUICK_ATTACK - db 0 - - db SONY3,$2 - db 1,3,EARTHQUAKE - db 2,4,KINESIS - db 3,4,LEECH_SEED - db 4,1,THUNDERBOLT - db 5,1,ICE_BEAM - db 6,2,REFLECT - db 6,3,QUICK_ATTACK - db 0 - - db SONY3,$3 - db 1,3,EARTHQUAKE - db 2,4,KINESIS - db 3,4,LEECH_SEED - db 4,1,CONFUSE_RAY - db 4,4,FIRE_SPIN - db 5,1,THUNDERBOLT - db 6,1,AURORA_BEAM - db 6,3,QUICK_ATTACK - db 0 - - db $ff -endc diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm index 8a8f3fdb..750a2f4e 100755 --- a/data/wildPokemon/route22.asm +++ b/data/wildPokemon/route22.asm @@ -24,16 +24,4 @@ Route22Mons: db 3,NIDORAN_M db 4,NIDORAN_M ENDC - IF DEF(_YELLOW) - db 2,NIDORAN_M - db 2,NIDORAN_F - db 3,MANKEY - db 3,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,MANKEY - db 2,SPEAROW - db 4,SPEAROW - db 6,SPEAROW - ENDC db $00 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 31b490f3..be8d2b18 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -373,9 +373,6 @@ ENDC IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine2.2bpp" ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine2.2bpp" -ENDC MoveAnimation: ; 78d5e (1e:4d5e) push hl diff --git a/engine/battle/core.asm b/engine/battle/core.asm index ac808a34..fce78717 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2982,11 +2982,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6) jp Delay3 DisabledText: ; 3d555 (f:5555) -IF DEF(_YELLOW) - db "Disabled!@" -ELSE db "disabled!@" -ENDC TypeText: ; 3d55f (f:555f) db "TYPE@" diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index d367bdb5..0be2e6b0 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -343,9 +343,6 @@ BillsPCMenuText: ; 216e1 (8:56e1) next "DEPOSIT ", $4a next "RELEASE ", $4a next "CHANGE BOX" -IF DEF(_YELLOW) - next "PRINT BOX" -ENDC next "SEE YA!" db "@" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index a58523e8..3898ef43 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -367,9 +367,6 @@ PokedexMenuItemsText: ; 402af (10:42af) db "DATA" next "CRY" next "AREA" -IF DEF(_YELLOW) - next "PRNT" -ENDC next "QUIT@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 9b5622b8..61775531 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -219,22 +219,6 @@ DefaultNamesRival: ; 6abe (1:6abe) db "@" ENDC -IF DEF(_YELLOW) -DefaultNamesPlayer: - db "NEW NAME" - next "YELLOW" - next "ASH" - next "JACK" - db "@" - -DefaultNamesRival: - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" -ENDC - GetDefaultName: ; 6ad6 (1:6ad6) ; a = name index ; hl = name list @@ -271,12 +255,6 @@ DefaultNamesPlayerList: ; 6af2 (1:6af2) DefaultNamesRivalList: ; 6b08 (1:6b08) db "NEW NAME@RED@ASH@JACK@" ENDC -IF DEF(_YELLOW) -DefaultNamesPlayerList: - db "NEW NAME@YELLOW@ASH@JACK@" -DefaultNamesRivalList: - db "NEW NAME@BLUE@GARY@JOHN@" -ENDC TextTerminator_6b20: ; 6b20 (1:6b20) db "@" diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index b2917459..eb1cf3c3 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -888,6 +888,3 @@ ENDC IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine1.2bpp" ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine1.2bpp" -ENDC -- cgit v1.3.1-sl0p From 72790bcbacc7405fe8d94d57c98adc45e0812705 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 6 Apr 2016 20:58:45 -0600 Subject: Clean up labels and trainer headers for overworld Pokémon. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/event_constants.asm | 24 ++++---- scripts/powerplant.asm | 124 +++++++++++++++++++------------------- scripts/seafoamislands1.asm | 6 +- scripts/seafoamislands2.asm | 6 +- scripts/seafoamislands3.asm | 6 +- scripts/seafoamislands4.asm | 22 +++---- scripts/seafoamislands5.asm | 61 +++++++++---------- scripts/unknowndungeon1.asm | 4 +- scripts/unknowndungeon2.asm | 4 +- scripts/unknowndungeon3.asm | 34 +++++------ scripts/victoryroad1.asm | 32 +++++----- scripts/victoryroad2.asm | 92 ++++++++++++++-------------- scripts/victoryroad3.asm | 54 ++++++++--------- text/maps/seafoam_islands_b4f.asm | 2 +- text/maps/unknown_dungeon_b1f.asm | 2 +- text/maps/victory_road_2f.asm | 2 +- 16 files changed, 237 insertions(+), 238 deletions(-) diff --git a/constants/event_constants.asm b/constants/event_constants.asm index f284c967..47448d09 100755 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -1121,15 +1121,15 @@ const_value = 0 const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45E, (D7D2, bit 6) const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 ; 45F, (D7D2, bit 7) const EVENT_460 ; 460, (D7D3, bit 0) - const EVENT_BEAT_POWER_PLANT_TRAINER_0 ; 461, (D7D3, bit 1) - const EVENT_BEAT_POWER_PLANT_TRAINER_1 ; 462, (D7D3, bit 2) - const EVENT_BEAT_POWER_PLANT_TRAINER_2 ; 463, (D7D3, bit 3) - const EVENT_BEAT_POWER_PLANT_TRAINER_3 ; 464, (D7D3, bit 4) - const EVENT_BEAT_POWER_PLANT_TRAINER_4 ; 465, (D7D3, bit 5) - const EVENT_BEAT_POWER_PLANT_TRAINER_5 ; 466, (D7D3, bit 6) - const EVENT_BEAT_POWER_PLANT_TRAINER_6 ; 467, (D7D3, bit 7) - const EVENT_BEAT_POWER_PLANT_TRAINER_7 ; 468, (D7D4, bit 0) - const EVENT_BEAT_POWER_PLANT_TRAINER_8 ; 469, (D7D4, bit 1) + const EVENT_BEAT_POWER_PLANT_VOLTORB_0 ; 461, (D7D3, bit 1) + const EVENT_BEAT_POWER_PLANT_VOLTORB_1 ; 462, (D7D3, bit 2) + const EVENT_BEAT_POWER_PLANT_VOLTORB_2 ; 463, (D7D3, bit 3) + const EVENT_BEAT_POWER_PLANT_VOLTORB_3 ; 464, (D7D3, bit 4) + const EVENT_BEAT_POWER_PLANT_VOLTORB_4 ; 465, (D7D3, bit 5) + const EVENT_BEAT_POWER_PLANT_VOLTORB_5 ; 466, (D7D3, bit 6) + const EVENT_BEAT_POWER_PLANT_VOLTORB_6 ; 467, (D7D3, bit 7) + const EVENT_BEAT_POWER_PLANT_VOLTORB_7 ; 468, (D7D4, bit 0) + const EVENT_BEAT_ZAPDOS ; 469, (D7D4, bit 1) const EVENT_46A ; 46A, (D7D4, bit 2) const EVENT_46B ; 46B, (D7D4, bit 3) const EVENT_46C ; 46C, (D7D4, bit 4) @@ -1342,7 +1342,7 @@ const_value = 0 const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53B, (D7EE, bit 3) const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53C, (D7EE, bit 4) const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 ; 53D, (D7EE, bit 5) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 ; 53E, (D7EE, bit 6) + const EVENT_BEAT_MOLTRES ; 53E, (D7EE, bit 6) const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ; 53F, (D7EE, bit 7) const EVENT_GOT_NUGGET ; 540, (D7EF, bit 0) const EVENT_BEAT_ROUTE24_ROCKET ; 541, (D7EF, bit 1) @@ -2241,7 +2241,7 @@ const_value = 0 const EVENT_8BE ; 8BE, (D85E, bit 6) const EVENT_8BF ; 8BF, (D85E, bit 7) const EVENT_8C0 ; 8C0, (D85F, bit 0) - const EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 ; 8C1, (D85F, bit 1) + const EVENT_BEAT_MEWTWO ; 8C1, (D85F, bit 1) const EVENT_8C2 ; 8C2, (D85F, bit 2) const EVENT_8C3 ; 8C3, (D85F, bit 3) const EVENT_8C4 ; 8C4, (D85F, bit 4) @@ -2522,7 +2522,7 @@ const_value = 0 const EVENT_9D7 ; 9D7, (D881, bit 7) const EVENT_9D8 ; 9D8, (D882, bit 0) const EVENT_9D9 ; 9D9, (D882, bit 1) - const EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 ; 9DA, (D882, bit 2) + const EVENT_BEAT_ARTICUNO ; 9DA, (D882, bit 2) const EVENT_9DB ; 9DB, (D882, bit 3) const EVENT_9DC ; 9DC, (D882, bit 4) const EVENT_9DD ; 9DD, (D882, bit 5) diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index 1470a091..c7a5625f 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -1,110 +1,110 @@ -PowerPlantScript: ; 1e2c6 (7:62c6) +PowerPlantScript: call EnableAutoTextBoxDrawing ld hl, PowerPlantTrainerHeaders - ld de, PowerPlantScriptPointers + ld de, .ScriptPointers ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable ld [wPowerPlantCurScript], a ret -PowerPlantScriptPointers: ; 1e2d9 (7:62d9) +.ScriptPointers dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PowerPlantTextPointers: ; 1e2df (7:62df) - dw PowerPlantText1 - dw PowerPlantText2 - dw PowerPlantText3 - dw PowerPlantText4 - dw PowerPlantText5 - dw PowerPlantText6 - dw PowerPlantText7 - dw PowerPlantText8 - dw PowerPlantText9 +PowerPlantTextPointers: + dw Voltorb0Text + dw Voltorb1Text + dw Voltorb2Text + dw Voltorb3Text + dw Voltorb4Text + dw Voltorb5Text + dw Voltorb6Text + dw Voltorb7Text + dw ZapdosText dw PickUpItemText dw PickUpItemText dw PickUpItemText dw PickUpItemText dw PickUpItemText -PowerPlantTrainerHeaders: ; 1e2fb (7:62fb) -PowerPlantTrainerHeader0: ; 1e2fb (7:62fb) - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_0 +PowerPlantTrainerHeaders: +Voltorb0TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_0 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader1: ; 1e307 (7:6307) - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_1 +Voltorb1TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_1 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader2: ; 1e313 (7:6313) - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_2 +Voltorb2TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader3: ; 1e31f (7:631f) - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_3 +Voltorb3TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader4: ; 1e32b (7:632b) - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_4 +Voltorb4TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader5: ; 1e337 (7:6337) - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_5 +Voltorb5TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader6: ; 1e343 (7:6343) - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_6 +Voltorb6TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader7: ; 1e34f (7:634f) - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_7, 1 +Voltorb7TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_7, 1 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader8: ; 1e35b (7:635b) - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_8, 1 +ZapdosTrainerHeader: + dbEventFlagBit EVENT_BEAT_ZAPDOS, 1 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1 dw ZapdosBattleText ; TextBeforeBattle dw ZapdosBattleText ; TextAfterBattle dw ZapdosBattleText ; TextEndBattle @@ -112,62 +112,62 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b) db $ff -InitVoltorbBattle: ; 1e368 (7:6368) +InitVoltorbBattle: call TalkToTrainer ld a, [wCurMapScript] ld [wPowerPlantCurScript], a jp TextScriptEnd -PowerPlantText1: ; 1e374 (7:6374) +Voltorb0Text: TX_ASM - ld hl, PowerPlantTrainerHeader0 + ld hl, Voltorb0TrainerHeader jr InitVoltorbBattle -PowerPlantText2: ; 1e37a (7:637a) +Voltorb1Text: TX_ASM - ld hl, PowerPlantTrainerHeader1 + ld hl, Voltorb1TrainerHeader jr InitVoltorbBattle -PowerPlantText3: ; 1e380 (7:6380) +Voltorb2Text: TX_ASM - ld hl, PowerPlantTrainerHeader2 + ld hl, Voltorb2TrainerHeader jr InitVoltorbBattle -PowerPlantText4: ; 1e386 (7:6386) +Voltorb3Text: TX_ASM - ld hl, PowerPlantTrainerHeader3 + ld hl, Voltorb3TrainerHeader jr InitVoltorbBattle -PowerPlantText5: ; 1e38c (7:638c) +Voltorb4Text: TX_ASM - ld hl, PowerPlantTrainerHeader4 + ld hl, Voltorb4TrainerHeader jr InitVoltorbBattle -PowerPlantText6: ; 1e392 (7:6392) +Voltorb5Text: TX_ASM - ld hl, PowerPlantTrainerHeader5 + ld hl, Voltorb5TrainerHeader jr InitVoltorbBattle -PowerPlantText7: ; 1e398 (7:6398) +Voltorb6Text: TX_ASM - ld hl, PowerPlantTrainerHeader6 + ld hl, Voltorb6TrainerHeader jr InitVoltorbBattle -PowerPlantText8: ; 1e39e (7:639e) +Voltorb7Text: TX_ASM - ld hl, PowerPlantTrainerHeader7 + ld hl, Voltorb7TrainerHeader jr InitVoltorbBattle -PowerPlantText9: ; 1e3a4 (7:63a4) +ZapdosText: TX_ASM - ld hl, PowerPlantTrainerHeader8 + ld hl, ZapdosTrainerHeader jr InitVoltorbBattle -VoltorbBattleText: ; 1e3aa (7:63aa) +VoltorbBattleText: TX_FAR _VoltorbBattleText db "@" -ZapdosBattleText: ; 1e3af (7:63af) +ZapdosBattleText: TX_FAR _ZapdosBattleText TX_ASM ld a, ZAPDOS diff --git a/scripts/seafoamislands1.asm b/scripts/seafoamislands1.asm index f9a2e7fc..52561fa7 100755 --- a/scripts/seafoamislands1.asm +++ b/scripts/seafoamislands1.asm @@ -1,4 +1,4 @@ -SeafoamIslands1Script: ; 447e9 (11:47e9) +SeafoamIslands1Script: call EnableAutoTextBoxDrawing SetEvent EVENT_IN_SEAFOAM_ISLANDS ld hl, wFlags_0xcd60 @@ -37,11 +37,11 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) ld hl, Seafoam1HolesCoords jp IsPlayerOnDungeonWarp -Seafoam1HolesCoords: ; 44846 (11:4846) +Seafoam1HolesCoords: db $06,$11 db $06,$18 db $ff -SeafoamIslands1TextPointers: ; 4484b (11:484b) +SeafoamIslands1TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm index 2c2962f8..50024bad 100755 --- a/scripts/seafoamislands2.asm +++ b/scripts/seafoamislands2.asm @@ -1,4 +1,4 @@ -SeafoamIslands2Script: ; 46315 (11:6315) +SeafoamIslands2Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -36,11 +36,11 @@ SeafoamIslands2Script: ; 46315 (11:6315) ld hl, Seafoam2HolesCoords jp IsPlayerOnDungeonWarp -Seafoam2HolesCoords: ; 4636d (11:636d) +Seafoam2HolesCoords: db $06,$12 db $06,$17 db $ff -SeafoamIslands2TextPointers: ; 46372 (11:6372) +SeafoamIslands2TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm index 6dda7f37..4a7848a4 100755 --- a/scripts/seafoamislands3.asm +++ b/scripts/seafoamislands3.asm @@ -1,4 +1,4 @@ -SeafoamIslands3Script: ; 46451 (11:6451) +SeafoamIslands3Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -36,11 +36,11 @@ SeafoamIslands3Script: ; 46451 (11:6451) ld hl, Seafoam3HolesCoords jp IsPlayerOnDungeonWarp -Seafoam3HolesCoords: ; 464a9 (11:64a9) +Seafoam3HolesCoords: db $06,$13 db $06,$16 db $ff -SeafoamIslands3TextPointers: ; 464ae (11:64ae) +SeafoamIslands3TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index e3234b0a..34873004 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -1,4 +1,4 @@ -SeafoamIslands4Script: ; 4658d (11:658d) +SeafoamIslands4Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -44,18 +44,18 @@ SeafoamIslands4Script: ; 4658d (11:658d) ld a, [wSeafoamIslands4CurScript] jp CallFunctionInTable -Seafoam4HolesCoords: ; 465f6 (11:65f6) +Seafoam4HolesCoords: db $10,$03 db $10,$06 db $ff -SeafoamIslands4ScriptPointers: ; 465fb (11:65fb) +SeafoamIslands4ScriptPointers: dw SeafoamIslands4Script0 dw SeafoamIslands4Script1 dw SeafoamIslands4Script2 dw SeafoamIslands4Script3 -SeafoamIslands4Script0: ; 46603 (11:6603) +SeafoamIslands4Script0: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wYCoord] @@ -76,13 +76,13 @@ SeafoamIslands4Script0: ; 46603 (11:6603) ld [wSeafoamIslands4CurScript], a ret -RLEMovement46632: ; 46632 (11:6632) +RLEMovement46632: db D_DOWN,6 db D_RIGHT,5 db D_DOWN,3 db $ff -SeafoamIslands4Script1: ; 46639 (11:6639) +SeafoamIslands4Script1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -90,7 +90,7 @@ SeafoamIslands4Script1: ; 46639 (11:6639) ld [wSeafoamIslands4CurScript], a ret -SeafoamIslands4Script2: ; 46644 (11:6644) +SeafoamIslands4Script2: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wXCoord] @@ -119,20 +119,20 @@ SeafoamIslands4Script2: ; 46644 (11:6644) ld [wSeafoamIslands4CurScript], a ret -RLEData_4667f: ; 4667f (11:667f) +RLEData_4667f: db D_DOWN,$06 db D_RIGHT,$02 db D_DOWN,$04 db D_LEFT,$01 db $FF -RLEData_46688: ; 46688 (11:6688) +RLEData_46688: db D_DOWN,$06 db D_RIGHT,$02 db D_DOWN,$04 db $FF -SeafoamIslands4Script3: ; 4668f (11:668f) +SeafoamIslands4Script3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -140,7 +140,7 @@ SeafoamIslands4Script3: ; 4668f (11:668f) ld [wSeafoamIslands4CurScript], a ret -SeafoamIslands4TextPointers: ; 4669a (11:669a) +SeafoamIslands4TextPointers: dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index 98c27666..a233fb6a 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -1,23 +1,23 @@ -SeafoamIslands5Script: ; 46799 (11:6799) +SeafoamIslands5Script: call EnableAutoTextBoxDrawing ld a, [wSeafoamIslands5CurScript] ld hl, SeafoamIslands5ScriptPointers jp CallFunctionInTable -SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) +SeafoamIslands5Script_467a5: xor a ld [wSeafoamIslands5CurScript], a ld [wJoyIgnore], a ret -SeafoamIslands5ScriptPointers: ; 467ad (11:67ad) +SeafoamIslands5ScriptPointers: dw SeafoamIslands5Script0 dw SeafoamIslands5Script1 dw SeafoamIslands5Script2 dw SeafoamIslands5Script3 dw SeafoamIslands5Script4 -SeafoamIslands5Script4: ; 467b7 (11:67b7) +SeafoamIslands5Script4: ld a, [wIsInBattle] cp $ff jr z, SeafoamIslands5Script_467a5 @@ -26,10 +26,10 @@ SeafoamIslands5Script4: ; 467b7 (11:67b7) ld [wSeafoamIslands5CurScript], a ret -SeafoamIslands5Script0: ; 467c7 (11:67c7) +SeafoamIslands5Script0: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld hl, CoordsData_467fe + ld hl, .Coords call ArePlayerCoordsInArray ret nc ld a, [wCoordIndex] @@ -52,14 +52,14 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7) ld [wSeafoamIslands5CurScript], a ret -CoordsData_467fe: ; 467fe (11:67fe) +.Coords db $11,$14 db $11,$15 db $10,$14 db $10,$15 db $FF -SeafoamIslands5Script1: ; 46807 (11:6807) +SeafoamIslands5Script1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -69,11 +69,11 @@ SeafoamIslands5Script1: ; 46807 (11:6807) ld [wSeafoamIslands5CurScript], a ret -SeafoamIslands5Script2: ; 46816 (11:6816) +SeafoamIslands5Script2: CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ld a, $0 jr z, .asm_46849 - ld hl, CoordsData_4684d + ld hl, .Coords call ArePlayerCoordsInArray ld a, $0 jr nc, .asm_46849 @@ -95,24 +95,24 @@ SeafoamIslands5Script2: ; 46816 (11:6816) ld [wSeafoamIslands5CurScript], a ret -CoordsData_4684d: ; 4684d (11:684d) +.Coords db $0E,$04 db $0E,$05 db $FF -RLEMovementData_46852: ; 46852 (11:6852) +RLEMovementData_46852: db D_UP,$03 db D_RIGHT,$02 db D_UP,$01 db $FF -RLEMovementData_46859: ; 46859 (11:6859) +RLEMovementData_46859: db D_UP,$03 db D_RIGHT,$03 db D_UP,$01 db $FF -SeafoamIslands5Script3: ; 46860 (11:6860) +SeafoamIslands5Script3: ld a, [wSimulatedJoypadStatesIndex] ld b, a cp $1 @@ -124,51 +124,50 @@ SeafoamIslands5Script3: ; 46860 (11:6860) ld [wSeafoamIslands5CurScript], a ret -SeaFoamIslands5Script_46872: ; 46872 (11:6872) +SeaFoamIslands5Script_46872: xor a ld [wWalkBikeSurfState], a ld [wWalkBikeSurfStateCopy], a jp ForceBikeOrSurf -SeafoamIslands5TextPointers: ; 4687c (11:687c) +SeafoamIslands5TextPointers: dw BoulderText dw BoulderText - dw SeafoamIslands5Text3 + dw ArticunoText dw SeafoamIslands5Text4 dw SeafoamIslands5Text5 -SeafoamIslands5TrainerHeaders: ; 46886 (11:6886) -SeafoamIslands5TrainerHeader0: ; 46886 (11:6886) - dbEventFlagBit EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 +ArticunoTrainerHeader: + dbEventFlagBit EVENT_BEAT_ARTICUNO db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 - dw SeafoamIslands5BattleText2 ; TextBeforeBattle - dw SeafoamIslands5BattleText2 ; TextAfterBattle - dw SeafoamIslands5BattleText2 ; TextEndBattle - dw SeafoamIslands5BattleText2 ; TextEndBattle + dwEventFlagAddress EVENT_BEAT_ARTICUNO + dw ArticunoBattleText ; TextBeforeBattle + dw ArticunoBattleText ; TextAfterBattle + dw ArticunoBattleText ; TextEndBattle + dw ArticunoBattleText ; TextEndBattle db $ff -SeafoamIslands5Text3: ; 46893 (11:6893) +ArticunoText: TX_ASM - ld hl, SeafoamIslands5TrainerHeader0 + ld hl, ArticunoTrainerHeader call TalkToTrainer ld a, $4 ld [wSeafoamIslands5CurScript], a jp TextScriptEnd -SeafoamIslands5BattleText2: ; 468a2 (11:68a2) - TX_FAR _SeafoamIslands5BattleText2 +ArticunoBattleText: + TX_FAR _ArticunoBattleText TX_ASM ld a, ARTICUNO call PlayCry call WaitForSoundToFinish jp TextScriptEnd -SeafoamIslands5Text4: ; 468b2 (11:68b2) +SeafoamIslands5Text4: TX_FAR _SeafoamIslands5Text4 db "@" -SeafoamIslands5Text5: ; 468b7 (11:68b7) +SeafoamIslands5Text5: TX_FAR _SeafoamIslands5Text5 db "@" diff --git a/scripts/unknowndungeon1.asm b/scripts/unknowndungeon1.asm index 696ddafa..9d7f120e 100755 --- a/scripts/unknowndungeon1.asm +++ b/scripts/unknowndungeon1.asm @@ -1,7 +1,7 @@ -UnknownDungeon1Script: ; 74d0c (1d:4d0c) +UnknownDungeon1Script: jp EnableAutoTextBoxDrawing -UnknownDungeon1TextPointers: ; 74d0f (1d:4d0f) +UnknownDungeon1TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/unknowndungeon2.asm b/scripts/unknowndungeon2.asm index f3cbb6a5..3ed00a45 100755 --- a/scripts/unknowndungeon2.asm +++ b/scripts/unknowndungeon2.asm @@ -1,7 +1,7 @@ -UnknownDungeon2Script: ; 45e0b (11:5e0b) +UnknownDungeon2Script: jp EnableAutoTextBoxDrawing -UnknownDungeon2TextPointers: ; 45e0e (11:5e0e) +UnknownDungeon2TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index c5818032..2790694b 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -1,42 +1,42 @@ -UnknownDungeon3Script: ; 45ef0 (11:5ef0) +UnknownDungeon3Script: call EnableAutoTextBoxDrawing ld hl, UnknownDungeon3TrainerHeaders - ld de, UnknownDungeon3ScriptPointers + ld de, .ScriptPointers ld a, [wUnknownDungeon3CurScript] call ExecuteCurMapScriptInTable ld [wUnknownDungeon3CurScript], a ret -UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03) +.ScriptPointers dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -UnknownDungeon3TextPointers: ; 45f09 (11:5f09) - dw UnknownDungeon3Text1 +UnknownDungeon3TextPointers: + dw MewtwoText dw PickUpItemText dw PickUpItemText -UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f) -UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f) - dbEventFlagBit EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 +UnknownDungeon3TrainerHeaders: +MewtwoTrainerHeader: + dbEventFlagBit EVENT_BEAT_MEWTWO db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 - dw UnknownDungeon3MewtwoText ; TextBeforeBattle - dw UnknownDungeon3MewtwoText ; TextAfterBattle - dw UnknownDungeon3MewtwoText ; TextEndBattle - dw UnknownDungeon3MewtwoText ; TextEndBattle + dwEventFlagAddress EVENT_BEAT_MEWTWO + dw MewtwoBattleText ; TextBeforeBattle + dw MewtwoBattleText ; TextAfterBattle + dw MewtwoBattleText ; TextEndBattle + dw MewtwoBattleText ; TextEndBattle db $ff -UnknownDungeon3Text1: ; 45f1c (11:5f1c) +MewtwoText: TX_ASM - ld hl, UnknownDungeon3TrainerHeader0 + ld hl, MewtwoTrainerHeader call TalkToTrainer jp TextScriptEnd -UnknownDungeon3MewtwoText: ; 45f26 (11:5f26) - TX_FAR _UnknownDungeon3MewtwoText +MewtwoBattleText: + TX_FAR _MewtwoBattleText TX_ASM ld a, MEWTWO call PlayCry diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index af0c3c3e..8ec6725b 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -1,4 +1,4 @@ -VictoryRoad1Script: ; 5da0a (17:5a0a) +VictoryRoad1Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -18,12 +18,12 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) lb bc, 6, 4 predef_jump ReplaceTileBlock -VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a) +VictoryRoad1ScriptPointers: dw VictoryRoad1Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -VictoryRoad1Script0: ; 5da40 (17:5a40) +VictoryRoad1Script0: CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH jp nz, CheckFightingMapTrainers ld hl, CoordsData_5da5c @@ -34,10 +34,10 @@ VictoryRoad1Script0: ; 5da40 (17:5a40) SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH ret -CoordsData_5da5c: ; 5da5c (17:5a5c) +CoordsData_5da5c: db $0D,$11,$FF -VictoryRoad1TextPointers: ; 5da5f (17:5a5f) +VictoryRoad1TextPointers: dw VictoryRoad1Text1 dw VictoryRoad1Text2 dw PickUpItemText @@ -46,8 +46,8 @@ VictoryRoad1TextPointers: ; 5da5f (17:5a5f) dw BoulderText dw BoulderText -VictoryRoad1TrainerHeaders: ; 5da6d (17:5a6d) -VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d) +VictoryRoad1TrainerHeaders: +VictoryRoad1TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 @@ -56,7 +56,7 @@ VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d) dw VictoryRoad1EndBattleText1 ; TextEndBattle dw VictoryRoad1EndBattleText1 ; TextEndBattle -VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79) +VictoryRoad1TrainerHeader1: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 @@ -67,38 +67,38 @@ VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79) db $ff -VictoryRoad1Text1: ; 5da86 (17:5a86) +VictoryRoad1Text1: TX_ASM ld hl, VictoryRoad1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad1Text2: ; 5da90 (17:5a90) +VictoryRoad1Text2: TX_ASM ld hl, VictoryRoad1TrainerHeader1 call TalkToTrainer jp TextScriptEnd -VictoryRoad1BattleText1: ; 5da9a (17:5a9a) +VictoryRoad1BattleText1: TX_FAR _VictoryRoad1BattleText1 db "@" -VictoryRoad1EndBattleText1: ; 5da9f (17:5a9f) +VictoryRoad1EndBattleText1: TX_FAR _VictoryRoad1EndBattleText1 db "@" -VictoryRoad1AfterBattleText1: ; 5daa4 (17:5aa4) +VictoryRoad1AfterBattleText1: TX_FAR _VictoryRoad1AfterBattleText1 db "@" -VictoryRoad1BattleText2: ; 5daa9 (17:5aa9) +VictoryRoad1BattleText2: TX_FAR _VictoryRoad1BattleText2 db "@" -VictoryRoad1EndBattleText2: ; 5daae (17:5aae) +VictoryRoad1EndBattleText2: TX_FAR _VictoryRoad1EndBattleText2 db "@" -VictoryRoad1AfterBattleText2: ; 5dab3 (17:5ab3) +VictoryRoad1AfterBattleText2: TX_FAR _VictoryRoad1AfterBattleText2 db "@" diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index c1fc6dc7..5a3413ee 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -1,4 +1,4 @@ -VictoryRoad2Script: ; 5179d (14:579d) +VictoryRoad2Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] @@ -15,10 +15,10 @@ VictoryRoad2Script: ; 5179d (14:579d) ld [wVictoryRoad2CurScript], a ret -VictoryRoad2Script_517c4: ; 517c4 (14:57c4) +VictoryRoad2Script_517c4: ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH -VictoryRoad2Script_517c9: ; 517c9 (14:57c9) +VictoryRoad2Script_517c9: CheckEvent EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 jr z, .asm_517da push af @@ -32,17 +32,17 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9) ld a, $1d lb bc, 7, 11 -VictoryRoad2Script_517e2: ; 517e2 (14:57e2) +VictoryRoad2Script_517e2: ld [wNewTileBlockID], a predef ReplaceTileBlock ret -VictoryRoad2ScriptPointers: ; 517eb (14:57eb) +VictoryRoad2ScriptPointers: dw VictoryRoad2Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -VictoryRoad2Script0: ; 517f1 (14:57f1) +VictoryRoad2Script0: ld hl, CoordsData_51816 call CheckBoulderCoords jp nc, CheckFightingMapTrainers @@ -63,18 +63,18 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) set 5, [hl] ret -CoordsData_51816: ; 51816 (14:5816) +CoordsData_51816: db $10,$01 db $10,$09 db $FF -VictoryRoad2TextPointers: ; 5181b (14:581b) +VictoryRoad2TextPointers: dw VictoryRoad2Text1 dw VictoryRoad2Text2 dw VictoryRoad2Text3 dw VictoryRoad2Text4 dw VictoryRoad2Text5 - dw VictoryRoad2Text6 + dw MoltresText dw PickUpItemText dw PickUpItemText dw PickUpItemText @@ -83,8 +83,8 @@ VictoryRoad2TextPointers: ; 5181b (14:581b) dw BoulderText dw BoulderText -VictoryRoad2TrainerHeaders: ; 51835 (14:5835) -VictoryRoad2TrainerHeader0: ; 51835 (14:5835) +VictoryRoad2TrainerHeaders: +VictoryRoad2TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 @@ -93,7 +93,7 @@ VictoryRoad2TrainerHeader0: ; 51835 (14:5835) dw VictoryRoad2EndBattleText1 ; TextEndBattle dw VictoryRoad2EndBattleText1 ; TextEndBattle -VictoryRoad2TrainerHeader2: ; 51841 (14:5841) +VictoryRoad2TrainerHeader2: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 @@ -102,7 +102,7 @@ VictoryRoad2TrainerHeader2: ; 51841 (14:5841) dw VictoryRoad2EndBattleText2 ; TextEndBattle dw VictoryRoad2EndBattleText2 ; TextEndBattle -VictoryRoad2TrainerHeader3: ; 5184d (14:584d) +VictoryRoad2TrainerHeader3: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 @@ -111,7 +111,7 @@ VictoryRoad2TrainerHeader3: ; 5184d (14:584d) dw VictoryRoad2EndBattleText3 ; TextEndBattle dw VictoryRoad2EndBattleText3 ; TextEndBattle -VictoryRoad2TrainerHeader4: ; 51859 (14:5859) +VictoryRoad2TrainerHeader4: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 @@ -120,7 +120,7 @@ VictoryRoad2TrainerHeader4: ; 51859 (14:5859) dw VictoryRoad2EndBattleText4 ; TextEndBattle dw VictoryRoad2EndBattleText4 ; TextEndBattle -VictoryRoad2TrainerHeader5: ; 51865 (14:5865) +VictoryRoad2TrainerHeader5: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 @@ -129,117 +129,117 @@ VictoryRoad2TrainerHeader5: ; 51865 (14:5865) dw VictoryRoad2EndBattleText5 ; TextEndBattle dw VictoryRoad2EndBattleText5 ; TextEndBattle -VictoryRoad2TrainerHeader6: ; 51871 (14:5871) - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 +MoltresTrainerHeader: + dbEventFlagBit EVENT_BEAT_MOLTRES db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 - dw VictoryRoad2BattleText6 ; TextBeforeBattle - dw VictoryRoad2BattleText6 ; TextAfterBattle - dw VictoryRoad2BattleText6 ; TextEndBattle - dw VictoryRoad2BattleText6 ; TextEndBattle + dwEventFlagAddress EVENT_BEAT_MOLTRES + dw MoltresBattleText ; TextBeforeBattle + dw MoltresBattleText ; TextAfterBattle + dw MoltresBattleText ; TextEndBattle + dw MoltresBattleText ; TextEndBattle db $ff -VictoryRoad2Text1: ; 5187e (14:587e) +VictoryRoad2Text1: TX_ASM ld hl, VictoryRoad2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text2: ; 51888 (14:5888) +VictoryRoad2Text2: TX_ASM ld hl, VictoryRoad2TrainerHeader2 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text3: ; 51892 (14:5892) +VictoryRoad2Text3: TX_ASM ld hl, VictoryRoad2TrainerHeader3 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text4: ; 5189c (14:589c) +VictoryRoad2Text4: TX_ASM ld hl, VictoryRoad2TrainerHeader4 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text5: ; 518a6 (14:58a6) +VictoryRoad2Text5: TX_ASM ld hl, VictoryRoad2TrainerHeader5 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text6: ; 518b0 (14:58b0) +MoltresText: TX_ASM - ld hl, VictoryRoad2TrainerHeader6 + ld hl, MoltresTrainerHeader call TalkToTrainer jp TextScriptEnd -VictoryRoad2BattleText6: ; 518ba (14:58ba) - TX_FAR _VictoryRoad2BattleText6 +MoltresBattleText: + TX_FAR _MoltresBattleText TX_ASM ld a, MOLTRES call PlayCry call WaitForSoundToFinish jp TextScriptEnd -VictoryRoad2BattleText1: ; 518ca (14:58ca) +VictoryRoad2BattleText1: TX_FAR _VictoryRoad2BattleText1 db "@" -VictoryRoad2EndBattleText1: ; 518cf (14:58cf) +VictoryRoad2EndBattleText1: TX_FAR _VictoryRoad2EndBattleText1 db "@" -VictoryRoad2AfterBattleText1: ; 518d4 (14:58d4) +VictoryRoad2AfterBattleText1: TX_FAR _VictoryRoad2AfterBattleText1 db "@" -VictoryRoad2BattleText2: ; 518d9 (14:58d9) +VictoryRoad2BattleText2: TX_FAR _VictoryRoad2BattleText2 db "@" -VictoryRoad2EndBattleText2: ; 518de (14:58de) +VictoryRoad2EndBattleText2: TX_FAR _VictoryRoad2EndBattleText2 db "@" -VictoryRoad2AfterBattleText2: ; 518e3 (14:58e3) +VictoryRoad2AfterBattleText2: TX_FAR _VictoryRoad2AfterBattleText2 db "@" -VictoryRoad2BattleText3: ; 518e8 (14:58e8) +VictoryRoad2BattleText3: TX_FAR _VictoryRoad2BattleText3 db "@" -VictoryRoad2EndBattleText3: ; 518ed (14:58ed) +VictoryRoad2EndBattleText3: TX_FAR _VictoryRoad2EndBattleText3 db "@" -VictoryRoad2AfterBattleText3: ; 518f2 (14:58f2) +VictoryRoad2AfterBattleText3: TX_FAR _VictoryRoad2AfterBattleText3 db "@" -VictoryRoad2BattleText4: ; 518f7 (14:58f7) +VictoryRoad2BattleText4: TX_FAR _VictoryRoad2BattleText4 db "@" -VictoryRoad2EndBattleText4: ; 518fc (14:58fc) +VictoryRoad2EndBattleText4: TX_FAR _VictoryRoad2EndBattleText4 db "@" -VictoryRoad2AfterBattleText4: ; 51901 (14:5901) +VictoryRoad2AfterBattleText4: TX_FAR _VictoryRoad2AfterBattleText4 db "@" -VictoryRoad2BattleText5: ; 51906 (14:5906) +VictoryRoad2BattleText5: TX_FAR _VictoryRoad2BattleText5 db "@" -VictoryRoad2EndBattleText5: ; 5190b (14:590b) +VictoryRoad2EndBattleText5: TX_FAR _VictoryRoad2EndBattleText5 db "@" -VictoryRoad2AfterBattleText5: ; 51910 (14:5910) +VictoryRoad2AfterBattleText5: TX_FAR _VictoryRoad2AfterBattleText5 db "@" diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 4cdf3fb0..ef638a0f 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -1,4 +1,4 @@ -VictoryRoad3Script: ; 44980 (11:4980) +VictoryRoad3Script: call VictoryRoad3Script_44996 call EnableAutoTextBoxDrawing ld hl, VictoryRoad3TrainerHeaders @@ -8,7 +8,7 @@ VictoryRoad3Script: ; 44980 (11:4980) ld [wVictoryRoad3CurScript], a ret -VictoryRoad3Script_44996: ; 44996 (11:4996) +VictoryRoad3Script_44996: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -20,12 +20,12 @@ VictoryRoad3Script_44996: ; 44996 (11:4996) lb bc, 5, 3 predef_jump ReplaceTileBlock -VictoryRoad3ScriptPointers: ; 449b1 (11:49b1) +VictoryRoad3ScriptPointers: dw VictoryRoad3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -VictoryRoad3Script0: ; 449b7 (11:49b7) +VictoryRoad3Script0: ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] @@ -50,7 +50,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld [wMissableObjectIndex], a predef_jump ShowObject -.coordsData_449f9: ; 449f9 (11:49f9) +.coordsData_449f9: db $05,$03 db $0F,$17 db $FF @@ -74,7 +74,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) jp z, CheckFightingMapTrainers ret -VictoryRoad3TextPointers: ; 44a24 (11:4a24) +VictoryRoad3TextPointers: dw VictoryRoad3Text1 dw VictoryRoad3Text2 dw VictoryRoad3Text3 @@ -86,8 +86,8 @@ VictoryRoad3TextPointers: ; 44a24 (11:4a24) dw BoulderText dw BoulderText -VictoryRoad3TrainerHeaders: ; 44a38 (11:4a38) -VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38) +VictoryRoad3TrainerHeaders: +VictoryRoad3TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 @@ -96,7 +96,7 @@ VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38) dw VictoryRoad3EndBattleText2 ; TextEndBattle dw VictoryRoad3EndBattleText2 ; TextEndBattle -VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44) +VictoryRoad3TrainerHeader2: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 @@ -105,7 +105,7 @@ VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44) dw VictoryRoad3EndBattleText3 ; TextEndBattle dw VictoryRoad3EndBattleText3 ; TextEndBattle -VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50) +VictoryRoad3TrainerHeader3: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 @@ -114,7 +114,7 @@ VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50) dw VictoryRoad3EndBattleText4 ; TextEndBattle dw VictoryRoad3EndBattleText4 ; TextEndBattle -VictoryRoad3TrainerHeader4: ; 44a5c (11:4a5c) +VictoryRoad3TrainerHeader4: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 @@ -125,74 +125,74 @@ VictoryRoad3TrainerHeader4: ; 44a5c (11:4a5c) db $ff -VictoryRoad3Text1: ; 44a69 (11:4a69) +VictoryRoad3Text1: TX_ASM ld hl, VictoryRoad3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad3Text2: ; 44a73 (11:4a73) +VictoryRoad3Text2: TX_ASM ld hl, VictoryRoad3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -VictoryRoad3Text3: ; 44a7d (11:4a7d) +VictoryRoad3Text3: TX_ASM ld hl, VictoryRoad3TrainerHeader3 call TalkToTrainer jp TextScriptEnd -VictoryRoad3Text4: ; 44a87 (11:4a87) +VictoryRoad3Text4: TX_ASM ld hl, VictoryRoad3TrainerHeader4 call TalkToTrainer jp TextScriptEnd -VictoryRoad3BattleText2: ; 44a91 (11:4a91) +VictoryRoad3BattleText2: TX_FAR _VictoryRoad3BattleText2 db "@" -VictoryRoad3EndBattleText2: ; 44a96 (11:4a96) +VictoryRoad3EndBattleText2: TX_FAR _VictoryRoad3EndBattleText2 db "@" -VictoryRoad3AfterBattleText2: ; 44a9b (11:4a9b) +VictoryRoad3AfterBattleText2: TX_FAR _VictoryRoad3AfterBattleText2 db "@" -VictoryRoad3BattleText3: ; 44aa0 (11:4aa0) +VictoryRoad3BattleText3: TX_FAR _VictoryRoad3BattleText3 db "@" -VictoryRoad3EndBattleText3: ; 44aa5 (11:4aa5) +VictoryRoad3EndBattleText3: TX_FAR _VictoryRoad3EndBattleText3 db "@" -VictoryRoad3AfterBattleText3: ; 44aaa (11:4aaa) +VictoryRoad3AfterBattleText3: TX_FAR _VictoryRoad3AfterBattleText3 db "@" -VictoryRoad3BattleText4: ; 44aaf (11:4aaf) +VictoryRoad3BattleText4: TX_FAR _VictoryRoad3BattleText4 db "@" -VictoryRoad3EndBattleText4: ; 44ab4 (11:4ab4) +VictoryRoad3EndBattleText4: TX_FAR _VictoryRoad3EndBattleText4 db "@" -VictoryRoad3AfterBattleText4: ; 44ab9 (11:4ab9) +VictoryRoad3AfterBattleText4: TX_FAR _VictoryRoad3AfterBattleText4 db "@" -VictoryRoad3BattleText5: ; 44abe (11:4abe) +VictoryRoad3BattleText5: TX_FAR _VictoryRoad3BattleText5 db "@" -VictoryRoad3EndBattleText5: ; 44ac3 (11:4ac3) +VictoryRoad3EndBattleText5: TX_FAR _VictoryRoad3EndBattleText5 db "@" -VictoryRoad3AfterBattleText5: ; 44ac8 (11:4ac8) +VictoryRoad3AfterBattleText5: TX_FAR _VictoryRoad3AfterBattleText5 db "@" diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/seafoam_islands_b4f.asm index c4649f4f..dccb43c0 100644 --- a/text/maps/seafoam_islands_b4f.asm +++ b/text/maps/seafoam_islands_b4f.asm @@ -1,4 +1,4 @@ -_SeafoamIslands5BattleText2:: +_ArticunoBattleText:: text "Gyaoo!@@" _SeafoamIslands5Text4:: diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/unknown_dungeon_b1f.asm index bea7df28..4db8467f 100644 --- a/text/maps/unknown_dungeon_b1f.asm +++ b/text/maps/unknown_dungeon_b1f.asm @@ -1,3 +1,3 @@ -_UnknownDungeon3MewtwoText:: +_MewtwoBattleText:: text "Mew!@@" diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm index 390d8d54..bc1b6cd9 100644 --- a/text/maps/victory_road_2f.asm +++ b/text/maps/victory_road_2f.asm @@ -1,4 +1,4 @@ -_VictoryRoad2BattleText6:: +_MoltresBattleText:: text "Gyaoo!@@" _VictoryRoad2BattleText1:: -- cgit v1.3.1-sl0p From adc6a3aac7d883f9833c7da3f5896935715291e7 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Fri, 8 Apr 2016 19:04:36 -0600 Subject: Clean up script labels in marts and Pokémon Centers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/mart_inventories.asm | 30 +++++++++++------------ scripts/celadonmart1.asm | 10 ++++---- scripts/celadonmart2.asm | 14 +++++------ scripts/celadonmart3.asm | 44 ++++++++++++++++----------------- scripts/celadonmart4.asm | 12 ++++----- scripts/celadonmart5.asm | 14 +++++------ scripts/celadonmartelevator.asm | 32 ++++++++++++------------ scripts/celadonmartroof.asm | 44 ++++++++++++++++----------------- scripts/celadonpokecenter.asm | 16 ++++++------ scripts/ceruleanmart.asm | 10 ++++---- scripts/ceruleanpokecenter.asm | 18 +++++++------- scripts/cinnabarmart.asm | 10 ++++---- scripts/cinnabarpokecenter.asm | 18 +++++++------- scripts/fuchsiamart.asm | 10 ++++---- scripts/fuchsiapokecenter.asm | 16 ++++++------ scripts/indigoplateaulobby.asm | 20 +++++++-------- scripts/lavendermart.asm | 30 +++++++++++------------ scripts/lavenderpokecenter.asm | 18 +++++++------- scripts/mtmoonpokecenter.asm | 46 +++++++++++++++++------------------ scripts/pewtermart.asm | 24 +++++++++--------- scripts/pewterpokecenter.asm | 28 ++++++++++----------- scripts/rocktunnelpokecenter.asm | 18 +++++++------- scripts/saffronmart.asm | 10 ++++---- scripts/saffronpokecenter.asm | 18 +++++++------- scripts/vermilionmart.asm | 10 ++++---- scripts/vermilionpokecenter.asm | 18 +++++++------- scripts/viridianmart.asm | 28 ++++++++++----------- scripts/viridianpokecenter.asm | 18 +++++++------- text.asm | 1 + text/maps/celadon_dept_store_1f.asm | 1 - text/maps/celadon_dept_store_2f.asm | 1 - text/maps/celadon_dept_store_3f.asm | 1 - text/maps/celadon_dept_store_4f.asm | 1 - text/maps/celadon_dept_store_5f.asm | 1 - text/maps/celadon_dept_store_roof.asm | 1 - text/maps/celadon_pokecenter.asm | 1 - text/maps/cerulean_mart.asm | 1 - text/maps/cerulean_pokecenter.asm | 3 +-- text/maps/cinnabar_mart.asm | 1 - text/maps/cinnabar_pokecenter.asm | 2 -- text/maps/fuchsia_mart.asm | 1 - text/maps/fuchsia_pokecenter.asm | 1 - text/maps/indigo_plateau_lobby.asm | 3 +-- text/maps/lavender_mart.asm | 5 ++-- text/maps/lavender_pokecenter.asm | 3 --- text/maps/mt_moon_pokecenter.asm | 9 +++---- text/maps/pewter_mart.asm | 5 ++-- text/maps/pewter_pokecenter.asm | 4 +-- text/maps/rock_tunnel_pokecenter.asm | 3 +-- text/maps/saffron_mart.asm | 1 - text/maps/saffron_pokecenter.asm | 3 +-- text/maps/vermilion_mart.asm | 1 - text/maps/vermilion_pokecenter.asm | 2 -- text/maps/viridian_mart.asm | 18 -------------- text/maps/viridian_pokecenter.asm | 16 ++++++++++++ 55 files changed, 322 insertions(+), 352 deletions(-) create mode 100644 text/maps/viridian_pokecenter.asm diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm index 85f7459a..c88bd18c 100755 --- a/data/mart_inventories.asm +++ b/data/mart_inventories.asm @@ -3,16 +3,16 @@ ; first byte $FE, next byte # of items, last byte $FF ; Viridian -ViridianMartText6:: ; 2442 (0:2442) +ViridianCashierText:: db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF ; Pewter -PewterMartText1:: ; 2449 (0:2449) +PewterCashierText:: db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING db PARLYZ_HEAL,$FF ; Cerulean -CeruleanMartText1:: ; 2453 (0:2453) +CeruleanCashierText:: db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING db PARLYZ_HEAL,$FF @@ -20,56 +20,56 @@ CeruleanMartText1:: ; 2453 (0:2453) db $FE,1,BICYCLE,$FF ; Vermilion -VermilionMartText1:: ; 2461 (0:2461) +VermilionCashierText:: db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL db REPEL,$FF ; Lavender -LavenderMartText1:: ; 246a (0:246a) +LavenderCashierText:: db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF ; Celadon Dept. Store 2F (1) -CeladonMart2Text1:: ; 2476 (0:2476) +CeladonMart2Clerk1Text:: db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF ; Celadon Dept. Store 2F (2) -CeladonMart2Text2:: ; 2482 (0:2482) +CeladonMart2Clerk2Text:: db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF ; Celadon Dept. Store 4F -CeladonMart4Text1:: ; 248e (0:248e) +CeladonMart4ClerkText:: db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF ; Celadon Dept. Store 5F (1) -CeladonMart5Text3:: ; 2496 (0:2496) +CeladonMart5Clerk1Text:: db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED db X_SPECIAL,$FF ; Celadon Dept. Store 5F (2) -CeladonMart5Text4:: ; 24a0 (0:24a0) +CeladonMart5Clerk2Text:: db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF ; Fuchsia -FuchsiaMartText1:: ; 24a8 (0:24a8) +FuchsiaCashierText:: db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL db SUPER_REPEL,$FF -; unused? 24b1 +; unused? db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF ; Cinnabar -CinnabarMartText1:: ; 24b9 (0:24b9) +CinnabarCashierText:: db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE db FULL_HEAL,REVIVE,$FF ; Saffron -SaffronMartText1:: ; 24c3 (0:24c3) +SaffronCashierText:: db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL db REVIVE,$FF ; Indigo -IndigoPlateauLobbyText4:: ; 24cc (0:24cc) +IndigoCashierText:: db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL db REVIVE,MAX_REPEL,$FF diff --git a/scripts/celadonmart1.asm b/scripts/celadonmart1.asm index 041af8b3..0f67972b 100755 --- a/scripts/celadonmart1.asm +++ b/scripts/celadonmart1.asm @@ -1,19 +1,19 @@ -CeladonMart1Script: ; 60f86 (18:4f86) +CeladonMart1Script: jp EnableAutoTextBoxDrawing -CeladonMart1TextPointers: ; 60f89 (18:4f89) +CeladonMart1TextPointers: dw CeladonMart1Text1 dw CeladonMart1Text2 dw CeladonMart1Text3 -CeladonMart1Text1: ; 60f8f (18:4f8f) +CeladonMart1Text1: TX_FAR _CeladonMart1Text1 db "@" -CeladonMart1Text2: ; 60f94 (18:4f94) +CeladonMart1Text2: TX_FAR _CeladonMart1Text2 db "@" -CeladonMart1Text3: ; 60f99 (18:4f99) +CeladonMart1Text3: TX_FAR _CeladonMart1Text3 db "@" diff --git a/scripts/celadonmart2.asm b/scripts/celadonmart2.asm index 92f04399..c438d6e1 100755 --- a/scripts/celadonmart2.asm +++ b/scripts/celadonmart2.asm @@ -1,21 +1,21 @@ -CeladonMart2Script: ; 560f5 (15:60f5) +CeladonMart2Script: jp EnableAutoTextBoxDrawing -CeladonMart2TextPointers: ; 560f8 (15:60f8) - dw CeladonMart2Text1 - dw CeladonMart2Text2 +CeladonMart2TextPointers: + dw CeladonMart2Clerk1Text + dw CeladonMart2Clerk2Text dw CeladonMart2Text3 dw CeladonMart2Text4 dw CeladonMart2Text5 -CeladonMart2Text3: ; 56102 (15:6102) +CeladonMart2Text3: TX_FAR _CeladonMart2Text3 db "@" -CeladonMart2Text4: ; 56107 (15:6107) +CeladonMart2Text4: TX_FAR _CeladonMart2Text4 db "@" -CeladonMart2Text5: ; 5610c (15:610c) +CeladonMart2Text5: TX_FAR _CeladonMart2Text5 db "@" diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index c6c6ecc7..7b9940fa 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -1,7 +1,7 @@ -CeladonMart3Script: ; 48225 (12:4225) +CeladonMart3Script: jp EnableAutoTextBoxDrawing -CeladonMart3TextPointers: ; 48228 (12:4228) +CeladonMart3TextPointers: dw CeladonMart3Text1 dw CeladonMart3Text2 dw CeladonMart3Text3 @@ -20,7 +20,7 @@ CeladonMart3TextPointers: ; 48228 (12:4228) dw CeladonMart3Text16 dw CeladonMart3Text17 -CeladonMart3Text1: ; 4824a (12:424a) +CeladonMart3Text1: TX_ASM CheckEvent EVENT_GOT_TM18 jr nz, .asm_a5463 @@ -41,67 +41,67 @@ CeladonMart3Text1: ; 4824a (12:424a) call PrintText jp TextScriptEnd -TM18PreReceiveText: ; 48278 (12:4278) +TM18PreReceiveText: TX_FAR _TM18PreReceiveText db "@" -ReceivedTM18Text: ; 4827d (12:427d) +ReceivedTM18Text: TX_FAR _ReceivedTM18Text db $0B, "@" -TM18ExplanationText: ; 48283 (12:4283) +TM18ExplanationText: TX_FAR _TM18ExplanationText db "@" -TM18NoRoomText: ; 48288 (12:4288) +TM18NoRoomText: TX_FAR _TM18NoRoomText db "@" -CeladonMart3Text2: ; 4828d (12:428d) +CeladonMart3Text2: TX_FAR _CeladonMart3Text2 db "@" -CeladonMart3Text3: ; 48292 (12:4292) +CeladonMart3Text3: TX_FAR _CeladonMart3Text3 db "@" -CeladonMart3Text4: ; 48297 (12:4297) +CeladonMart3Text4: TX_FAR _CeladonMart3Text4 db "@" -CeladonMart3Text5: ; 4829c (12:429c) +CeladonMart3Text5: TX_FAR _CeladonMart3Text5 db "@" CeladonMart3Text12 -CeladonMart3Text10: ; 482a1 (12:42a1) -CeladonMart3Text8: ; 482a1 (12:42a1) -CeladonMart3Text6: ; 482a1 (12:42a1) +CeladonMart3Text10: +CeladonMart3Text8: +CeladonMart3Text6: TX_FAR _CeladonMart3Text6 db "@" -CeladonMart3Text7: ; 482a6 (12:42a6) +CeladonMart3Text7: TX_FAR _CeladonMart3Text7 db "@" -CeladonMart3Text9: ; 482ab (12:42ab) +CeladonMart3Text9: TX_FAR _CeladonMart3Text9 db "@" -CeladonMart3Text11: ; 482b0 (12:42b0) +CeladonMart3Text11: TX_FAR _CeladonMart3Text11 db "@" -CeladonMart3Text13: ; 482b5 (12:42b5) +CeladonMart3Text13: TX_FAR _CeladonMart3Text13 db "@" -CeladonMart3Text14: ; 482ba (12:42ba) +CeladonMart3Text14: TX_FAR _CeladonMart3Text14 db "@" -CeladonMart3Text17: ; 482bf (12:42bf) -CeladonMart3Text16: ; 482bf (12:42bf) -CeladonMart3Text15: ; 482bf (12:42bf) +CeladonMart3Text17: +CeladonMart3Text16: +CeladonMart3Text15: TX_FAR _CeladonMart3Text15 db "@" diff --git a/scripts/celadonmart4.asm b/scripts/celadonmart4.asm index dfe2b90a..18049dc0 100755 --- a/scripts/celadonmart4.asm +++ b/scripts/celadonmart4.asm @@ -1,20 +1,20 @@ -CeladonMart4Script: ; 48356 (12:4356) +CeladonMart4Script: jp EnableAutoTextBoxDrawing -CeladonMart4TextPointers: ; 48359 (12:4359) - dw CeladonMart4Text1 +CeladonMart4TextPointers: + dw CeladonMart4ClerkText dw CeladonMart4Text2 dw CeladonMart4Text3 dw CeladonMart4Text4 -CeladonMart4Text2: ; 48361 (12:4361) +CeladonMart4Text2: TX_FAR _CeladonMart4Text2 db "@" -CeladonMart4Text3: ; 48366 (12:4366) +CeladonMart4Text3: TX_FAR _CeladonMart4Text3 db "@" -CeladonMart4Text4: ; 4836b (12:436b) +CeladonMart4Text4: TX_FAR _CeladonMart4Text4 db "@" diff --git a/scripts/celadonmart5.asm b/scripts/celadonmart5.asm index 9bd7f991..7b7371a7 100755 --- a/scripts/celadonmart5.asm +++ b/scripts/celadonmart5.asm @@ -1,21 +1,21 @@ -CeladonMart5Script: ; 49069 (12:5069) +CeladonMart5Script: jp EnableAutoTextBoxDrawing -CeladonMart5TextPointers: ; 4906c (12:506c) +CeladonMart5TextPointers: dw CeladonMart5Text1 dw CeladonMart5Text2 - dw CeladonMart5Text3 - dw CeladonMart5Text4 + dw CeladonMart5Clerk1Text + dw CeladonMart5Clerk2Text dw CeladonMart5Text5 -CeladonMart5Text1: ; 49076 (12:5076) +CeladonMart5Text1: TX_FAR _CeladonMart5Text1 db "@" -CeladonMart5Text2: ; 4907b (12:507b) +CeladonMart5Text2: TX_FAR _CeladonMart5Text2 db "@" -CeladonMart5Text5: ; 49080 (12:5080) +CeladonMart5Text5: TX_FAR _CeladonMart5Text5 db "@" diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index e693d9fe..60e5210c 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevatorScript: ; 48600 (12:4600) +CeladonMartElevatorScript: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -14,7 +14,7 @@ CeladonMartElevatorScript: ; 48600 (12:4600) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -CeladonMartElevatorScript_4861c: ; 4861c (12:461c) +CeladonMartElevatorScript_4861c: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a @@ -22,7 +22,7 @@ CeladonMartElevatorScript_4861c: ; 4861c (12:461c) ld c, a call CeladonMartElevatorScript_4862a -CeladonMartElevatorScript_4862a: ; 4862a (12:462a) +CeladonMartElevatorScript_4862a: inc hl inc hl ld a, b @@ -31,24 +31,24 @@ CeladonMartElevatorScript_4862a: ; 4862a (12:462a) ld [hli], a ret -CeladonMartElevatorScript_48631: ; 48631 (12:4631) - ld hl, CeladonMartElavatorFloors +CeladonMartElevatorScript_48631: + ld hl, CeladonMartElevatorFloors call LoadItemList - ld hl, CeldaonMartElevatorWarpMaps + ld hl, CeladonMartElevatorWarpMaps ld de, wElevatorWarpMaps - ld bc, CeldaonMartElevatorWarpMapsEnd - CeldaonMartElevatorWarpMaps + ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps jp CopyData -CeladonMartElavatorFloors: ; 48643 (12:4643) - db $05 ; num elements in list +CeladonMartElevatorFloors: + db 5 ; number of elements in list db FLOOR_1F db FLOOR_2F db FLOOR_3F db FLOOR_4F db FLOOR_5F - db $FF ; terminator + db $FF -CeldaonMartElevatorWarpMaps: ; 4864a (12:464a) +CeladonMartElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. @@ -57,17 +57,17 @@ CeldaonMartElevatorWarpMaps: ; 4864a (12:464a) db $02, CELADON_MART_3 db $02, CELADON_MART_4 db $02, CELADON_MART_5 -CeldaonMartElevatorWarpMapsEnd: +CeladonMartElevatorWarpMapsEnd: -CeladonMartElevatorScript_48654: ; 48654 (12:4654) +CeladonMartElevatorScript_48654: jpba ShakeElevator -CeladonMartElevatorTextPointers: ; 4865c (12:465c) +CeladonMartElevatorTextPointers: dw CeladonMartElevatorText1 -CeladonMartElevatorText1: ; 4865e (12:465e) +CeladonMartElevatorText1: TX_ASM call CeladonMartElevatorScript_48631 - ld hl, CeldaonMartElevatorWarpMaps + ld hl, CeladonMartElevatorWarpMaps predef DisplayElevatorFloorMenu jp TextScriptEnd diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 439ab62e..d00fb0b5 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -1,7 +1,7 @@ -CeladonMartRoofScript: ; 483d5 (12:43d5) +CeladonMartRoofScript: jp EnableAutoTextBoxDrawing -CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8) +CeladonMartRoofScript_GetDrinksInBag: ; construct a list of all drinks in the player's bag xor a ld [wFilteredBagItemsCount], a @@ -34,13 +34,13 @@ CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8) ld [de], a ret -CeladonMartRoofDrinkList: ; 48408 (12:4408) +CeladonMartRoofDrinkList: db FRESH_WATER db SODA_POP db LEMONADE db $00 -CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c) +CeladonMartRoofScript_GiveDrinkToGirl: ld hl, wd730 set 6, [hl] ld hl, CeladonMartRoofText_484ee @@ -130,60 +130,60 @@ CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c) ld hl, CeladonMartRoofText_4852c jp PrintText -RemoveItemByIDBank12: ; 484e6 (12:44e6) +RemoveItemByIDBank12: jpba RemoveItemByID -CeladonMartRoofText_484ee: ; 484ee (12:44ee) +CeladonMartRoofText_484ee: TX_FAR _CeladonMartRoofText_484ee db "@" -CeladonMartRoofText_484f3: ; 484f3 (12:44f3) +CeladonMartRoofText_484f3: TX_FAR _CeladonMartRoofText_484f3 db $0d db "@" -CeladonMartRoofText_484f9: ; 484f9 (12:44f9) +CeladonMartRoofText_484f9: TX_FAR _CeladonMartRoofText_484f9 db $0b TX_FAR _CeladonMartRoofText_484fe db $0d db "@" -CeladonMartRoofText_48504: ; 48504 (12:4504) +CeladonMartRoofText_48504: TX_FAR _CeladonMartRoofText_48504 db $0d db "@" -CeladonMartRoofText_4850a: ; 4850a (12:450a) +CeladonMartRoofText_4850a: TX_FAR _CeladonMartRoofText_4850a db $0b TX_FAR _CeladonMartRoofText_4850f db $0d db "@" -CeladonMartRoofText_48515: ; 48515 (12:4515) +CeladonMartRoofText_48515: TX_FAR _CeladonMartRoofText_48515 db $0d db "@" -ReceivedTM49Text: ; 4851b (12:451b) +ReceivedTM49Text: TX_FAR _ReceivedTM49Text db $0b TX_FAR _CeladonMartRoofText_48520 db $0d db "@" -CeladonMartRoofText_48526: ; 48526 (12:4526) +CeladonMartRoofText_48526: TX_FAR _CeladonMartRoofText_48526 db $0d db "@" -CeladonMartRoofText_4852c: ; 4852c (12:452c) +CeladonMartRoofText_4852c: TX_FAR _CeladonMartRoofText_4852c db $0d db "@" -CeladonMartRoofScript_PrintDrinksInBag: ; 48532 (12:4532) +CeladonMartRoofScript_PrintDrinksInBag: ld hl, wFilteredBagItems xor a ld [hItemCounter], a @@ -205,7 +205,7 @@ CeladonMartRoofScript_PrintDrinksInBag: ; 48532 (12:4532) pop hl jr .loop -CeladonMartRoofTextPointers: ; 4855b (12:455b) +CeladonMartRoofTextPointers: dw CeladonMartRoofText1 dw CeladonMartRoofText2 dw CeladonMartRoofText5 @@ -213,11 +213,11 @@ CeladonMartRoofTextPointers: ; 4855b (12:455b) dw CeladonMartRoofText5 dw CeladonMartRoofText6 -CeladonMartRoofText1: ; 48567 (12:4567) +CeladonMartRoofText1: TX_FAR _CeladonMartRoofText1 db "@" -CeladonMartRoofText2: ; 4856c (12:456c) +CeladonMartRoofText2: TX_ASM call CeladonMartRoofScript_GetDrinksInBag ld a, [wFilteredBagItemsCount] @@ -239,17 +239,17 @@ CeladonMartRoofText2: ; 4856c (12:456c) .done jp TextScriptEnd -CeladonMartRoofText3: ; 48598 (12:4598) +CeladonMartRoofText3: TX_FAR _CeladonMartRoofText_48598 db "@" -CeladonMartRoofText4: ; 4859d (12:459d) +CeladonMartRoofText4: TX_FAR _CeladonMartRoofText4 db "@" -CeladonMartRoofText5: ; 485a2 (12:45a2) +CeladonMartRoofText5: db $f5 -CeladonMartRoofText6: ; 485a3 (12:45a3) +CeladonMartRoofText6: TX_FAR _CeladonMartRoofText6 db "@" diff --git a/scripts/celadonpokecenter.asm b/scripts/celadonpokecenter.asm index 1b8d3a1b..024a4ec3 100755 --- a/scripts/celadonpokecenter.asm +++ b/scripts/celadonpokecenter.asm @@ -1,23 +1,23 @@ -CeladonPokecenterScript: ; 488b8 (12:48b8) +CeladonPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CeladonPokecenterTextPointers: ; 488be (12:48be) - dw CeladonPokecenterText1 +CeladonPokecenterTextPointers: + dw CeladonHealNurseText dw CeladonPokecenterText2 dw CeladonPokecenterText3 - dw CeladonPokecenterText4 + dw CeladonTradeNurseText -CeladonPokecenterText4: ; 488c6 (12:48c6) +CeladonTradeNurseText: db $f6 -CeladonPokecenterText1: ; 488c7 (12:48c7) +CeladonHealNurseText: db $ff -CeladonPokecenterText2: ; 488c8 (12:48c8) +CeladonPokecenterText2: TX_FAR _CeladonPokecenterText2 db "@" -CeladonPokecenterText3: ; 488cd (12:48cd) +CeladonPokecenterText3: TX_FAR _CeladonPokecenterText3 db "@" diff --git a/scripts/ceruleanmart.asm b/scripts/ceruleanmart.asm index 7aea6d47..76d83f90 100755 --- a/scripts/ceruleanmart.asm +++ b/scripts/ceruleanmart.asm @@ -1,15 +1,15 @@ -CeruleanMartScript: ; 5c895 (17:4895) +CeruleanMartScript: jp EnableAutoTextBoxDrawing -CeruleanMartTextPointers: ; 5c898 (17:4898) - dw CeruleanMartText1 +CeruleanMartTextPointers: + dw CeruleanCashierText dw CeruleanMartText2 dw CeruleanMartText3 -CeruleanMartText2: ; 5c89e (17:489e) +CeruleanMartText2: TX_FAR _CeruleanMartText2 db "@" -CeruleanMartText3: ; 5c8a3 (17:48a3) +CeruleanMartText3: TX_FAR _CeruleanMartText3 db "@" diff --git a/scripts/ceruleanpokecenter.asm b/scripts/ceruleanpokecenter.asm index 5d888317..cb18da01 100755 --- a/scripts/ceruleanpokecenter.asm +++ b/scripts/ceruleanpokecenter.asm @@ -1,23 +1,23 @@ -CeruleanPokecenterScript: ; 5c645 (17:4645) +CeruleanPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CeruleanPokecenterTextPointers: ; 5c64b (17:464b) - dw CeruleanPokecenterText1 +CeruleanPokecenterTextPointers: + dw CeruleanHealNurseText dw CeruleanPokecenterText2 dw CeruleanPokecenterText3 - dw CeruleanPokecenterText4 + dw CeruleanTradeNurseText -CeruleanPokecenterText4: ; 5c653 (17:4653) +CeruleanTradeNurseText: db $f6 -CeruleanPokecenterText1: ; 5c654 (17:4654) +CeruleanHealNurseText: db $ff -CeruleanPokecenterText2: ; 5c655 (17:4655) - TX_FAR _CeruleanPokecenterText1 +CeruleanPokecenterText2: + TX_FAR _CeruleanPokecenterText2 db "@" -CeruleanPokecenterText3: ; 5c65a (17:465a) +CeruleanPokecenterText3: TX_FAR _CeruleanPokecenterText3 db "@" diff --git a/scripts/cinnabarmart.asm b/scripts/cinnabarmart.asm index 2abd7b67..55b82cf0 100755 --- a/scripts/cinnabarmart.asm +++ b/scripts/cinnabarmart.asm @@ -1,15 +1,15 @@ -CinnabarMartScript: ; 75e7e (1d:5e7e) +CinnabarMartScript: jp EnableAutoTextBoxDrawing -CinnabarMartTextPointers: ; 75e81 (1d:5e81) - dw CinnabarMartText1 +CinnabarMartTextPointers: + dw CinnabarCashierText dw CinnabarMartText2 dw CinnabarMartText3 -CinnabarMartText2: ; 75e87 (1d:5e87) +CinnabarMartText2: TX_FAR _CinnabarMartText2 db "@" -CinnabarMartText3: ; 75e8c (1d:5e8c) +CinnabarMartText3: TX_FAR _CinnabarMartText3 db "@" diff --git a/scripts/cinnabarpokecenter.asm b/scripts/cinnabarpokecenter.asm index abae9d8d..3835f3d6 100755 --- a/scripts/cinnabarpokecenter.asm +++ b/scripts/cinnabarpokecenter.asm @@ -1,23 +1,23 @@ -CinnabarPokecenterScript: ; 75e2c (1d:5e2c) +CinnabarPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CinnabarPokecenterTextPointers: ; 75e32 (1d:5e32) - dw CinnabarPokecenterText1 +CinnabarPokecenterTextPointers: + dw CinnabarHealNurseText dw CinnabarPokecenterText2 dw CinnabarPokecenterText3 - dw CinnabarPokecenterText4 + dw CinnabarTradeNurseText -CinnabarPokecenterText1: ; 75e3a (1d:5e3a) +CinnabarHealNurseText: db $ff -CinnabarPokecenterText2: ; 75e3b (1d:5e3b) - TX_FAR _CinnabarPokecenterText1 +CinnabarPokecenterText2: + TX_FAR _CinnabarPokecenterText2 db "@" -CinnabarPokecenterText3: ; 75e40 (1d:5e40) +CinnabarPokecenterText3: TX_FAR _CinnabarPokecenterText3 db "@" -CinnabarPokecenterText4: ; 75e45 (1d:5e45) +CinnabarTradeNurseText: db $f6 diff --git a/scripts/fuchsiamart.asm b/scripts/fuchsiamart.asm index 792dafa2..96df9290 100755 --- a/scripts/fuchsiamart.asm +++ b/scripts/fuchsiamart.asm @@ -1,15 +1,15 @@ -FuchsiaMartScript: ; 1dd88 (7:5d88) +FuchsiaMartScript: jp EnableAutoTextBoxDrawing -FuchsiaMartTextPointers: ; 1dd8b (7:5d8b) - dw FuchsiaMartText1 +FuchsiaMartTextPointers: + dw FuchsiaCashierText dw FuchsiaMartText2 dw FuchsiaMartText3 -FuchsiaMartText2: ; 1dd91 (7:5d91) +FuchsiaMartText2: TX_FAR _FuchsiaMartText2 db "@" -FuchsiaMartText3: ; 1dd96 (7:5d96) +FuchsiaMartText3: TX_FAR _FuchsiaMartText3 db "@" diff --git a/scripts/fuchsiapokecenter.asm b/scripts/fuchsiapokecenter.asm index 26f88844..d17e5810 100755 --- a/scripts/fuchsiapokecenter.asm +++ b/scripts/fuchsiapokecenter.asm @@ -1,23 +1,23 @@ -FuchsiaPokecenterScript: ; 75063 (1d:5063) +FuchsiaPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -FuchsiaPokecenterTextPointers: ; 75069 (1d:5069) - dw FuchsiaPokecenterText1 +FuchsiaPokecenterTextPointers: + dw FuchsiaHealNurseText dw FuchsiaPokecenterText2 dw FuchsiaPokecenterText3 - dw FuchsiaPokecenterText4 + dw FuchsiaTradeNurseText -FuchsiaPokecenterText1: ; 75071 (1d:5071) +FuchsiaHealNurseText: db $ff -FuchsiaPokecenterText2: ; 75072 (1d:5072) +FuchsiaPokecenterText2: TX_FAR _FuchsiaPokecenterText1 db "@" -FuchsiaPokecenterText3: ; 75077 (1d:5077) +FuchsiaPokecenterText3: TX_FAR _FuchsiaPokecenterText3 db "@" -FuchsiaPokecenterText4: ; 7507c (1d:507c) +FuchsiaTradeNurseText: db $f6 diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index e524ed62..35570f48 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) +IndigoPlateauLobbyScript: call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing ld hl, wCurrentMapScriptFlags @@ -14,23 +14,23 @@ IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR ret -IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f) - dw IndigoPlateauLobbyText1 +IndigoPlateauLobbyTextPointers: + dw IndigoHealNurseText dw IndigoPlateauLobbyText2 dw IndigoPlateauLobbyText3 - dw IndigoPlateauLobbyText4 - dw IndigoPlateauLobbyText5 + dw IndigoCashierText + dw IndigoTradeNurseText -IndigoPlateauLobbyText1: ; 19c89 (6:5c89) +IndigoHealNurseText: db $ff -IndigoPlateauLobbyText2: ; 19c8a (6:5c8a) - TX_FAR _IndigoPlateauLobbyText1 +IndigoPlateauLobbyText2: + TX_FAR _IndigoPlateauLobbyText2 db "@" -IndigoPlateauLobbyText3: ; 19c8f (6:5c8f) +IndigoPlateauLobbyText3: TX_FAR _IndigoPlateauLobbyText3 db "@" -IndigoPlateauLobbyText5: ; 19c94 (6:5c94) +IndigoTradeNurseText: db $f6 diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm index 85518fd2..51b64992 100755 --- a/scripts/lavendermart.asm +++ b/scripts/lavendermart.asm @@ -1,32 +1,32 @@ -LavenderMartScript: ; 5c92c (17:492c) +LavenderMartScript: jp EnableAutoTextBoxDrawing -LavenderMartTextPointers: ; 5c92f (17:492f) - dw LavenderMartText1 +LavenderMartTextPointers: + dw LavenderCashierText dw LavenderMartText2 dw LavenderMartText3 -LavenderMartText2: ; 5c935 (17:4935) +LavenderMartText2: TX_FAR _LavenderMartText2 db "@" -LavenderMartText3: ; 5c93a (17:493a) +LavenderMartText3: TX_ASM CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_c88d4 - ld hl, LavenderMart_5c953 + jr nz, .Nugget + ld hl, .ReviveText call PrintText - jr .asm_6d225 -.asm_c88d4 - ld hl, LavenderMart_5c958 + jr .done +.Nugget + ld hl, .NuggetText call PrintText -.asm_6d225 +.done jp TextScriptEnd -LavenderMart_5c953: ; 5c953 (17:4953) - TX_FAR _LavenderMart_5c953 +.ReviveText + TX_FAR _LavenderMartReviveText db "@" -LavenderMart_5c958: ; 5c958 (17:4958) - TX_FAR _LavenderMart_5c958 +.NuggetText + TX_FAR _LavenderMartNuggetText db "@" diff --git a/scripts/lavenderpokecenter.asm b/scripts/lavenderpokecenter.asm index 452cc8a4..27a95b43 100755 --- a/scripts/lavenderpokecenter.asm +++ b/scripts/lavenderpokecenter.asm @@ -1,23 +1,23 @@ -LavenderPokecenterScript: ; 5c8da (17:48da) +LavenderPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -LavenderPokecenterTextPointers: ; 5c8e0 (17:48e0) - dw LavenderPokecenterText1 +LavenderPokecenterTextPointers: + dw LavenderHealNurseText dw LavenderPokecenterText2 dw LavenderPokecenterText3 - dw LavenderPokecenterText4 + dw LavenderTradeNurseText -LavenderPokecenterText4: ; 5c8e8 (17:48e8) +LavenderTradeNurseText: db $f6 -LavenderPokecenterText1: ; 5c8e9 (17:48e9) +LavenderHealNurseText: db $ff -LavenderPokecenterText2: ; 5c8ea (17:48ea) - TX_FAR _LavenderPokecenterText1 +LavenderPokecenterText2: + TX_FAR _LavenderPokecenterText2 db "@" -LavenderPokecenterText3: ; 5c8ef (17:48ef) +LavenderPokecenterText3: TX_FAR _LavenderPokecenterText3 db "@" diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index fd3e4e53..b5edee8d 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -1,31 +1,31 @@ -MtMoonPokecenterScript: ; 492cf (12:52cf) +MtMoonPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -MtMoonPokecenterTextPointers: ; 492d5 (12:52d5) - dw MtMoonPokecenterText1 +MtMoonPokecenterTextPointers: + dw MtMoonHealNurseText dw MtMoonPokecenterText2 dw MtMoonPokecenterText3 - dw MtMoonPokecenterText4 + dw MagikarpSalesmanText dw MtMoonPokecenterText5 - dw MtMoonPokecenterText6 + dw MtMoonTradeNurseText -MtMoonPokecenterText1: ; 492e1 (12:52e1) +MtMoonHealNurseText: db $ff -MtMoonPokecenterText2: ; 492e2 (12:52e2) +MtMoonPokecenterText2: TX_FAR _MtMoonPokecenterText1 db "@" -MtMoonPokecenterText3: ; 492e7 (12:52e7) +MtMoonPokecenterText3: TX_FAR _MtMoonPokecenterText3 db "@" -MtMoonPokecenterText4: ; 492ec (12:52ec) +MagikarpSalesmanText: TX_ASM CheckEvent EVENT_BOUGHT_MAGIKARP, 1 jp c, .alreadyBoughtMagikarp - ld hl, MtMoonPokecenterText_4935c + ld hl, .Text1 call PrintText ld a, MONEY_BOX ld [wTextBoxID], a @@ -40,7 +40,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) ld [hMoney + 1], a call HasEnoughMoney jr nc, .enoughMoney - ld hl, MtMoonPokecenterText_49366 + ld hl, .NoMoneyText jr .printText .enoughMoney lb bc, MAGIKARP, 5 @@ -61,34 +61,34 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) SetEvent EVENT_BOUGHT_MAGIKARP jr .done .choseNo - ld hl, MtMoonPokecenterText_49361 + ld hl, .RefuseText jr .printText .alreadyBoughtMagikarp - ld hl, MtMoonPokecenterText_4936b + ld hl, .Text2 .printText call PrintText .done jp TextScriptEnd -MtMoonPokecenterText_4935c: ; 4935c (12:535c) - TX_FAR _MtMoonPokecenterText_4935c +.Text1 + TX_FAR _MagikarpSalesmanText1 db "@" -MtMoonPokecenterText_49361: ; 49361 (12:5361) - TX_FAR _MtMoonPokecenterText_49361 +.RefuseText + TX_FAR _MagikarpSalesmanNoText db "@" -MtMoonPokecenterText_49366: ; 49366 (12:5366) - TX_FAR _MtMoonPokecenterText_49366 +.NoMoneyText + TX_FAR _MagikarpSalesmanNoMoneyText db "@" -MtMoonPokecenterText_4936b: ; 4936b (12:536b) - TX_FAR _MtMoonPokecenterText_4936b +.Text2 + TX_FAR _MagikarpSalesmanText2 db "@" -MtMoonPokecenterText5: ; 49370 (12:5370) +MtMoonPokecenterText5: TX_FAR _MtMoonPokecenterText5 db "@" -MtMoonPokecenterText6: ; 49375 (12:5375) +MtMoonTradeNurseText: db $f6 diff --git a/scripts/pewtermart.asm b/scripts/pewtermart.asm index 62831d1b..d5281704 100755 --- a/scripts/pewtermart.asm +++ b/scripts/pewtermart.asm @@ -1,30 +1,28 @@ -PewterMartScript: ; 74cad (1d:4cad) +PewterMartScript: call EnableAutoTextBoxDrawing ld a, $1 ld [wAutoTextBoxDrawingControl], a ret -PewterMartTextPointers: ; 74cb6 (1d:4cb6) - dw PewterMartText1 +PewterMartTextPointers: + dw PewterCashierText dw PewterMartText2 dw PewterMartText3 -PewterMartText2: ; 74cbc (1d:4cbc) +PewterMartText2: TX_ASM - ld hl, PewterMartText_74cc6 + ld hl, .Text call PrintText jp TextScriptEnd - -PewterMartText_74cc6: ; 74cc6 (1d:4cc6) - TX_FAR _PewterMartText_74cc6 +.Text + TX_FAR _PewterMartText2 db "@" -PewterMartText3: ; 74ccb (1d:4ccb) +PewterMartText3: TX_ASM - ld hl, PewterMartText_74cd5 + ld hl, .Text call PrintText jp TextScriptEnd - -PewterMartText_74cd5: ; 74cd5 (1d:4cd5) - TX_FAR _PewterMartText_74cd5 +.Text + TX_FAR _PewterMartText3 db "@" diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 46d4d509..9398d027 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -1,25 +1,25 @@ -PewterPokecenterScript: ; 5c587 (17:4587) +PewterPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -PewterPokecenterTextPointers: ; 5c58d (17:458d) - dw PewterPokecenterText1 +PewterPokecenterTextPointers: + dw PewterHealNurseText dw PewterPokecenterText2 - dw PewterPokecenterText3 - dw PewterPokecenterText4 + dw PewterJigglypuffText + dw PewterTradeNurseText -PewterPokecenterText1: ; 5c595 (17:4595) +PewterHealNurseText: db $ff -PewterPokecenterText2: ; 5c596 (17:4596) - TX_FAR _PewterPokecenterText1 +PewterPokecenterText2: + TX_FAR _PewterPokecenterText2 db "@" -PewterPokecenterText3: ; 5c59b (17:459b) +PewterJigglypuffText: TX_ASM ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, PewterPokecenterText5 + ld hl, .Text call PrintText ld a, $ff call PlaySound @@ -70,16 +70,16 @@ PewterPokecenterText3: ; 5c59b (17:459b) call PlayDefaultMusic jp TextScriptEnd -PewterPokecenterText5: ; 5c603 (17:4603) - TX_FAR _PewterPokecenterText5 +.Text + TX_FAR _PewterJigglypuffText db "@" -JigglypuffFacingDirections: ; 5c608 (17:4608) +JigglypuffFacingDirections: db $30 | SPRITE_FACING_DOWN db $30 | SPRITE_FACING_LEFT db $30 | SPRITE_FACING_UP db $30 | SPRITE_FACING_RIGHT JigglypuffFacingDirectionsEnd: -PewterPokecenterText4: ; 5c60c (17:460c) +PewterTradeNurseText: db $f6 diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/rocktunnelpokecenter.asm index 5e822bca..7bcdc1ae 100755 --- a/scripts/rocktunnelpokecenter.asm +++ b/scripts/rocktunnelpokecenter.asm @@ -1,23 +1,23 @@ -RockTunnelPokecenterScript: ; 493ba (12:53ba) +RockTunnelPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -RockTunnelPokecenterTextPointers: ; 493c0 (12:53c0) - dw RockTunnelPokecenterText1 +RockTunnelPokecenterTextPointers: + dw RockTunnelHealNurseText dw RockTunnelPokecenterText2 dw RockTunnelPokecenterText3 - dw RockTunnelPokecenterText4 + dw RockTunnelTradeNurseText -RockTunnelPokecenterText1: ; 493c8 (12:53c8) +RockTunnelHealNurseText: db $ff -RockTunnelPokecenterText2: ; 493c9 (12:53c9) - TX_FAR _RockTunnelPokecenterText1 +RockTunnelPokecenterText2: + TX_FAR _RockTunnelPokecenterText2 db "@" -RockTunnelPokecenterText3: ; 493ce (12:53ce) +RockTunnelPokecenterText3: TX_FAR _RockTunnelPokecenterText3 db "@" -RockTunnelPokecenterText4: ; 493d3 (12:53d3) +RockTunnelTradeNurseText: db $f6 diff --git a/scripts/saffronmart.asm b/scripts/saffronmart.asm index 9ee1db0e..8b140610 100755 --- a/scripts/saffronmart.asm +++ b/scripts/saffronmart.asm @@ -1,15 +1,15 @@ -SaffronMartScript: ; 5d409 (17:5409) +SaffronMartScript: jp EnableAutoTextBoxDrawing -SaffronMartTextPointers: ; 5d40c (17:540c) - dw SaffronMartText1 +SaffronMartTextPointers: + dw SaffronCashierText dw SaffronMartText2 dw SaffronMartText3 -SaffronMartText2: ; 5d412 (17:5412) +SaffronMartText2: TX_FAR _SaffronMartText2 db "@" -SaffronMartText3: ; 5d417 (17:5417) +SaffronMartText3: TX_FAR _SaffronMartText3 db "@" diff --git a/scripts/saffronpokecenter.asm b/scripts/saffronpokecenter.asm index 8f569a8e..b99ef629 100755 --- a/scripts/saffronpokecenter.asm +++ b/scripts/saffronpokecenter.asm @@ -1,23 +1,23 @@ -SaffronPokecenterScript: ; 5d535 (17:5535) +SaffronPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -SaffronPokecenterTextPointers: ; 5d53b (17:553b) - dw SaffronPokecenterText1 +SaffronPokecenterTextPointers: + dw SaffronHealNurseText dw SaffronPokecenterText2 dw SaffronPokecenterText3 - dw SaffronPokecenterText4 + dw SaffronTradeNurseText -SaffronPokecenterText1: ; 5d543 (17:5543) +SaffronHealNurseText: db $ff -SaffronPokecenterText2: ; 5d544 (17:5544) - TX_FAR _SaffronPokecenterText1 +SaffronPokecenterText2: + TX_FAR _SaffronPokecenterText2 db "@" -SaffronPokecenterText3: ; 5d549 (17:5549) +SaffronPokecenterText3: TX_FAR _SaffronPokecenterText3 db "@" -SaffronPokecenterText4: ; 5d54e (17:554e) +SaffronTradeNurseText: db $f6 diff --git a/scripts/vermilionmart.asm b/scripts/vermilionmart.asm index 921e7852..2d4df78d 100755 --- a/scripts/vermilionmart.asm +++ b/scripts/vermilionmart.asm @@ -1,15 +1,15 @@ -VermilionMartScript: ; 5c9e1 (17:49e1) +VermilionMartScript: jp EnableAutoTextBoxDrawing -VermilionMartTextPointers: ; 5c9e4 (17:49e4) - dw VermilionMartText1 +VermilionMartTextPointers: + dw VermilionCashierText dw VermilionMartText2 dw VermilionMartText3 -VermilionMartText2: ; 5c9ea (17:49ea) +VermilionMartText2: TX_FAR _VermilionMartText2 db "@" -VermilionMartText3: ; 5c9ef (17:49ef) +VermilionMartText3: TX_FAR _VermilionMartText3 db "@" diff --git a/scripts/vermilionpokecenter.asm b/scripts/vermilionpokecenter.asm index 6e85b3e3..09c8a937 100755 --- a/scripts/vermilionpokecenter.asm +++ b/scripts/vermilionpokecenter.asm @@ -1,23 +1,23 @@ -VermilionPokecenterScript: ; 5c98f (17:498f) +VermilionPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -VermilionPokecenterTextPointers: ; 5c995 (17:4995) - dw VermilionPokecenterText1 +VermilionPokecenterTextPointers: + dw VermilionHealNurseText dw VermilionPokecenterText2 dw VermilionPokecenterText3 - dw VermilionPokecenterText4 + dw VermilionTradeNurseText -VermilionPokecenterText1: ; 5c99d (17:499d) +VermilionHealNurseText: db $ff -VermilionPokecenterText2: ; 5c99e (17:499e) - TX_FAR _VermilionPokecenterText1 +VermilionPokecenterText2: + TX_FAR _VermilionPokecenterText2 db "@" -VermilionPokecenterText3: ; 5c9a3 (17:49a3) +VermilionPokecenterText3: TX_FAR _VermilionPokecenterText3 db "@" -VermilionPokecenterText4: ; 5c9a8 (17:49a8) +VermilionTradeNurseText: db $f6 diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 65d97519..542040a6 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -1,11 +1,11 @@ -ViridianMartScript: ; 1d46e (7:546e) +ViridianMartScript: call ViridianMartScript_1d47d call EnableAutoTextBoxDrawing ld hl, ViridianMartScriptPointers ld a, [wViridianMarketCurScript] jp CallFunctionInTable -ViridianMartScript_1d47d: ; 1d47d (7:547d) +ViridianMartScript_1d47d: CheckEvent EVENT_OAK_GOT_PARCEL jr nz, .asm_1d489 ld hl, ViridianMartTextPointers @@ -19,12 +19,12 @@ ViridianMartScript_1d47d: ; 1d47d (7:547d) ld [wMapTextPtr+1], a ret -ViridianMartScriptPointers: ; 1d495 (7:5495) +ViridianMartScriptPointers: dw ViridianMartScript0 dw ViridianMartScript1 dw ViridianMartScript2 -ViridianMartScript0: ; 1d49b (7:549b) +ViridianMartScript0: call UpdateSprites ld a, $4 ld [hSpriteIndexOrTextID], a @@ -39,12 +39,12 @@ ViridianMartScript0: ; 1d49b (7:549b) ld [wViridianMarketCurScript], a ret -RLEMovement1d4bb: ; 1d4bb (7:54bb) +RLEMovement1d4bb: db D_LEFT, $01 db D_UP, $02 db $ff -ViridianMartScript1: ; 1d4c0 (7:54c0) +ViridianMartScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -58,36 +58,36 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) ld a, $2 ld [wViridianMarketCurScript], a ; fallthrough -ViridianMartScript2: ; 1d4df (7:54df) +ViridianMartScript2: ret -ViridianMartTextPointers: ; 1d4e0 (7:54e0) +ViridianMartTextPointers: dw ViridianMartText1 dw ViridianMartText2 dw ViridianMartText3 dw ViridianMartText4 dw ViridianMartText5 - dw ViridianMartText6 + dw ViridianCashierText dw ViridianMartText2 dw ViridianMartText3 -ViridianMartText1: ; 1d4f0 (7:54f0) +ViridianMartText1: TX_FAR _ViridianMartText1 db "@" -ViridianMartText4: ; 1d4f5 (7:54f5) +ViridianMartText4: TX_FAR _ViridianMartText4 db "@" -ViridianMartText5: ; 1d4fa (7:54fa) +ViridianMartText5: TX_FAR ViridianMartParcelQuestText db $11 db "@" -ViridianMartText2: ; 1d500 (7:5500) +ViridianMartText2: TX_FAR _ViridianMartText2 db "@" -ViridianMartText3: ; 1d505 (7:5505) +ViridianMartText3: TX_FAR _ViridianMartText3 db "@" diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm index ae5e32c8..d178446a 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/viridianpokecenter.asm @@ -1,23 +1,23 @@ -ViridianPokeCenterScript: ; 4425d (11:425d) +ViridianPokeCenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -ViridianPokecenterTextPointers: ; 44263 (11:4263) - dw ViridianPokeCenterText1 +ViridianPokecenterTextPointers: + dw ViridianHealNurseText dw ViridianPokeCenterText2 dw ViridianPokeCenterText3 - dw ViridianPokeCenterText4 + dw ViridianTradeNurseText -ViridianPokeCenterText1: ; 4426b (11:426b) +ViridianHealNurseText: db $ff -ViridianPokeCenterText2: ; 4426c (11:426c) - TX_FAR _ViridianPokeCenterText1 +ViridianPokeCenterText2: + TX_FAR _ViridianPokeCenterText2 db "@" -ViridianPokeCenterText3: ; 44271 (11:4271) +ViridianPokeCenterText3: TX_FAR _ViridianPokeCenterText3 db "@" -ViridianPokeCenterText4: ; 44276 (11:4276) +ViridianTradeNurseText: db $f6 diff --git a/text.asm b/text.asm index d88bc409..9a5ecff7 100644 --- a/text.asm +++ b/text.asm @@ -2339,6 +2339,7 @@ _ColosseumText1:: INCLUDE "text/maps/reds_house_1f.asm" INCLUDE "text/maps/blues_house.asm" INCLUDE "text/maps/oaks_lab.asm" +INCLUDE "text/maps/viridian_pokecenter.asm" INCLUDE "text/maps/viridian_mart.asm" INCLUDE "text/maps/school.asm" INCLUDE "text/maps/viridian_house.asm" diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/celadon_dept_store_1f.asm index cf343206..8d805edc 100644 --- a/text/maps/celadon_dept_store_1f.asm +++ b/text/maps/celadon_dept_store_1f.asm @@ -29,4 +29,3 @@ _CeladonMart1Text3:: text "1F: SERVICE" line " COUNTER" done - diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/celadon_dept_store_2f.asm index b1345a05..74869902 100644 --- a/text/maps/celadon_dept_store_2f.asm +++ b/text/maps/celadon_dept_store_2f.asm @@ -20,4 +20,3 @@ _CeladonMart2Text5:: para "2F: TRAINER'S" line " MARKET" done - diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index d98b4998..1aad756f 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -96,4 +96,3 @@ _CeladonMart3Text15:: text "Red and Blue!" line "Both are #MON!" done - diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm index 2fca6106..78fa0b66 100644 --- a/text/maps/celadon_dept_store_4f.asm +++ b/text/maps/celadon_dept_store_4f.asm @@ -24,4 +24,3 @@ _CeladonMart4Text4:: line "Element STONEs on" cont "sale now!" done - diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/celadon_dept_store_5f.asm index a2bb97f6..1871194b 100644 --- a/text/maps/celadon_dept_store_5f.asm +++ b/text/maps/celadon_dept_store_5f.asm @@ -26,4 +26,3 @@ _CeladonMart5Text2:: _CeladonMart5Text5:: text "5F: DRUG STORE" done - diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index 5099509f..4689b023 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -136,4 +136,3 @@ _VendingMachineText6:: _VendingMachineText7:: text "Not thirsty!" done - diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/celadon_pokecenter.asm index 32fa7a6a..a04f51c9 100644 --- a/text/maps/celadon_pokecenter.asm +++ b/text/maps/celadon_pokecenter.asm @@ -10,4 +10,3 @@ _CeladonPokecenterText3:: line "CYCLING ROAD from" cont "FUCHSIA!" done - diff --git a/text/maps/cerulean_mart.asm b/text/maps/cerulean_mart.asm index 8ebe0c32..86a74588 100644 --- a/text/maps/cerulean_mart.asm +++ b/text/maps/cerulean_mart.asm @@ -17,4 +17,3 @@ _CeruleanMartText3:: line "make #MON go" cont "up one level!" done - diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/cerulean_pokecenter.asm index e7933988..497fbce3 100644 --- a/text/maps/cerulean_pokecenter.asm +++ b/text/maps/cerulean_pokecenter.asm @@ -1,4 +1,4 @@ -_CeruleanPokecenterText1:: +_CeruleanPokecenterText2:: text "That BILL!" para "I heard that" @@ -22,4 +22,3 @@ _CeruleanPokecenterText3:: line "to boast about" cont "their #MON?" done - diff --git a/text/maps/cinnabar_mart.asm b/text/maps/cinnabar_mart.asm index 44292ca8..42a41d06 100644 --- a/text/maps/cinnabar_mart.asm +++ b/text/maps/cinnabar_mart.asm @@ -8,4 +8,3 @@ _CinnabarMartText3:: text "It never hurts to" line "have extra items!" done - diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/cinnabar_pokecenter.asm index e3e6cca9..cf481764 100644 --- a/text/maps/cinnabar_pokecenter.asm +++ b/text/maps/cinnabar_pokecenter.asm @@ -1,5 +1,4 @@ _CinnabarPokecenterText2:: -_CinnabarPokecenterText1:: text "You can cancel" line "evolution." @@ -20,4 +19,3 @@ _CinnabarPokecenterText3:: para "I think it's" line "worth a try!" done - diff --git a/text/maps/fuchsia_mart.asm b/text/maps/fuchsia_mart.asm index 6764e3a8..574898ce 100644 --- a/text/maps/fuchsia_mart.asm +++ b/text/maps/fuchsia_mart.asm @@ -12,4 +12,3 @@ _FuchsiaMartText3:: cont "up a #MON in" cont "battle!" done - diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/fuchsia_pokecenter.asm index 617c3b84..a0def7eb 100644 --- a/text/maps/fuchsia_pokecenter.asm +++ b/text/maps/fuchsia_pokecenter.asm @@ -18,4 +18,3 @@ _FuchsiaPokecenterText3:: cont "The HQ governs" cont "all trainers." done - diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/indigo_plateau_lobby.asm index bfac25c3..8487e29a 100644 --- a/text/maps/indigo_plateau_lobby.asm +++ b/text/maps/indigo_plateau_lobby.asm @@ -1,4 +1,4 @@ -_IndigoPlateauLobbyText1:: +_IndigoPlateauLobbyText2:: text "Yo! Champ in" line "making!" @@ -23,4 +23,3 @@ _IndigoPlateauLobbyText3:: cont "next trainer!" cont "Good luck!" done - diff --git a/text/maps/lavender_mart.asm b/text/maps/lavender_mart.asm index 69b8096f..222712c6 100644 --- a/text/maps/lavender_mart.asm +++ b/text/maps/lavender_mart.asm @@ -14,13 +14,13 @@ _LavenderMartText2:: line "I can get them?" done -_LavenderMart_5c953:: +_LavenderMartReviveText:: text "You know REVIVE?" line "It revives any" cont "fainted #MON!" done -_LavenderMart_5c958:: +_LavenderMartNuggetText:: text "I found a NUGGET" line "in the mountains." @@ -28,4 +28,3 @@ _LavenderMart_5c958:: line "useless, but it" cont "sold for ¥5000!" done - diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/lavender_pokecenter.asm index d982fa75..3aa7b67d 100644 --- a/text/maps/lavender_pokecenter.asm +++ b/text/maps/lavender_pokecenter.asm @@ -1,6 +1,4 @@ -_LavenderPokecenterText4:: _LavenderPokecenterText2:: -_LavenderPokecenterText1:: text "TEAM ROCKET will" line "do anything for" cont "the sake of gold!" @@ -12,4 +10,3 @@ _LavenderPokecenterText3:: cont "to escape from" cont "TEAM ROCKET!" done - diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm index 271008e7..90fd811e 100644 --- a/text/maps/mt_moon_pokecenter.asm +++ b/text/maps/mt_moon_pokecenter.asm @@ -16,7 +16,7 @@ _MtMoonPokecenterText3:: cont "news!" done -_MtMoonPokecenterText_4935c:: +_MagikarpSalesmanText1:: text "MAN: Hello, there!" line "Have I got a deal" cont "just for you!" @@ -27,18 +27,18 @@ _MtMoonPokecenterText_4935c:: cont "What do you say?" done -_MtMoonPokecenterText_49361:: +_MagikarpSalesmanNoText:: text "No? I'm only" line "doing this as a" cont "favor to you!" done -_MtMoonPokecenterText_49366:: +_MagikarpSalesmanNoMoneyText:: text "You'll need more" line "money than that!" done -_MtMoonPokecenterText_4936b:: +_MagikarpSalesmanText2:: text "MAN: Well, I don't" line "give refunds!" done @@ -46,4 +46,3 @@ _MtMoonPokecenterText_4936b:: _MtMoonPokecenterText5:: db $0 done - diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm index bac57a53..0d5b07a2 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/pewter_mart.asm @@ -1,4 +1,4 @@ -_PewterMartText_74cc6:: +_PewterMartText2:: text "A shady, old man" line "got me to buy" cont "this really weird" @@ -8,11 +8,10 @@ _PewterMartText_74cc6:: line "and it cost ¥500!" done -_PewterMartText_74cd5:: +_PewterMartText3:: text "Good things can" line "happen if you" cont "raise #MON" cont "diligently, even" cont "the weak ones!" done - diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/pewter_pokecenter.asm index 2df5c715..6a1b373e 100644 --- a/text/maps/pewter_pokecenter.asm +++ b/text/maps/pewter_pokecenter.asm @@ -1,4 +1,4 @@ -_PewterPokecenterText1:: +_PewterPokecenterText2:: text "What!?" para "TEAM ROCKET is" @@ -8,7 +8,7 @@ _PewterPokecenterText1:: para "Scram!" done -_PewterPokecenterText5:: +_PewterJigglypuffText:: text "JIGGLYPUFF: Puu" line "pupuu!" done diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/rock_tunnel_pokecenter.asm index a5268dd2..0fc249ff 100644 --- a/text/maps/rock_tunnel_pokecenter.asm +++ b/text/maps/rock_tunnel_pokecenter.asm @@ -1,4 +1,4 @@ -_RockTunnelPokecenterText1:: +_RockTunnelPokecenterText2:: text "The element types" line "of #MON make" cont "them stronger" @@ -11,4 +11,3 @@ _RockTunnelPokecenterText3:: text "I sold a useless" line "NUGGET for ¥5000!" done - diff --git a/text/maps/saffron_mart.asm b/text/maps/saffron_mart.asm index 29c34a1c..a43b0d94 100644 --- a/text/maps/saffron_mart.asm +++ b/text/maps/saffron_mart.asm @@ -11,4 +11,3 @@ _SaffronMartText3:: line "but it revives" cont "fainted #MON!" done - diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/saffron_pokecenter.asm index 9202af9b..6548aff8 100644 --- a/text/maps/saffron_pokecenter.asm +++ b/text/maps/saffron_pokecenter.asm @@ -1,4 +1,4 @@ -_SaffronPokecenterText1:: +_SaffronPokecenterText2:: text "#MON growth" line "rates differ from" cont "specie to specie." @@ -10,4 +10,3 @@ _SaffronPokecenterText3:: cont "why it attracted" cont "TEAM ROCKET!" done - diff --git a/text/maps/vermilion_mart.asm b/text/maps/vermilion_mart.asm index 9acdf905..10743989 100644 --- a/text/maps/vermilion_mart.asm +++ b/text/maps/vermilion_mart.asm @@ -21,4 +21,3 @@ _VermilionMartText3:: cont "evil. It depends" cont "on the trainer." done - diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/vermilion_pokecenter.asm index 8ba563dc..c9e9a581 100644 --- a/text/maps/vermilion_pokecenter.asm +++ b/text/maps/vermilion_pokecenter.asm @@ -1,5 +1,4 @@ _VermilionPokecenterText2:: -_VermilionPokecenterText1:: text "Even if they are" line "the same level," cont "#MON can have" @@ -18,4 +17,3 @@ _VermilionPokecenterText3:: cont "fainted while we" cont "were walking!" done - diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm index 4b569dfe..aa199335 100644 --- a/text/maps/viridian_mart.asm +++ b/text/maps/viridian_mart.asm @@ -1,21 +1,3 @@ -_ViridianPokeCenterText2:: -_ViridianPokeCenterText1:: - text "You can use that" - line "PC in the corner." - - para "The receptionist" - line "told me. So kind!" - done - -_ViridianPokeCenterText3:: - text "There's a #MON" - line "CENTER in every" - cont "town ahead." - - para "They don't charge" - line "any money either!" - done - _ViridianMartText1:: text "Okay! Say hi to" line "PROF.OAK for me!" diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/viridian_pokecenter.asm new file mode 100644 index 00000000..4ac18bf6 --- /dev/null +++ b/text/maps/viridian_pokecenter.asm @@ -0,0 +1,16 @@ +_ViridianPokeCenterText2:: + text "You can use that" + line "PC in the corner." + + para "The receptionist" + line "told me. So kind!" + done + +_ViridianPokeCenterText3:: + text "There's a #MON" + line "CENTER in every" + cont "town ahead." + + para "They don't charge" + line "any money either!" + done -- cgit v1.3.1-sl0p From c9bed2d44709a875dd2ed338ed192aec855ad6b2 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Fri, 8 Apr 2016 20:16:42 -0600 Subject: Add a TX_MART macro for inventories. --- data/mart_inventories.asm | 43 ++++++++++++++++--------------------------- macros.asm | 9 +++++++++ 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm index c88bd18c..35ae2e9d 100755 --- a/data/mart_inventories.asm +++ b/data/mart_inventories.asm @@ -1,75 +1,64 @@ ; mart inventories are below ; they are texts -; first byte $FE, next byte # of items, last byte $FF ; Viridian ViridianCashierText:: - db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF + TX_MART POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL ; Pewter PewterCashierText:: - db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING - db PARLYZ_HEAL,$FF + TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL ; Cerulean CeruleanCashierText:: - db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING - db PARLYZ_HEAL,$FF + TX_MART POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL ; Bike shop - db $FE,1,BICYCLE,$FF + TX_MART BICYCLE ; Vermilion VermilionCashierText:: - db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL - db REPEL,$FF + TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL ; Lavender LavenderCashierText:: - db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL - db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF + TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL ; Celadon Dept. Store 2F (1) CeladonMart2Clerk1Text:: - db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE - db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF + TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL ; Celadon Dept. Store 2F (2) CeladonMart2Clerk2Text:: - db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF + TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17 ; Celadon Dept. Store 4F CeladonMart4ClerkText:: - db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF + TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE ; Celadon Dept. Store 5F (1) CeladonMart5Clerk1Text:: - db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED - db X_SPECIAL,$FF + TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL ; Celadon Dept. Store 5F (2) CeladonMart5Clerk2Text:: - db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF + TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM ; Fuchsia FuchsiaCashierText:: - db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL - db SUPER_REPEL,$FF + TX_MART ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL ; unused? - db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF + TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE ; Cinnabar CinnabarCashierText:: - db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE - db FULL_HEAL,REVIVE,$FF + TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE ; Saffron SaffronCashierText:: - db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL - db REVIVE,$FF + TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE ; Indigo IndigoCashierText:: - db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL - db REVIVE,MAX_REPEL,$FF + TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL diff --git a/macros.asm b/macros.asm index a13a3a12..dc65287f 100644 --- a/macros.asm +++ b/macros.asm @@ -214,6 +214,15 @@ TX_ASM: MACRO db $08 ENDM +TX_MART: MACRO + db $FE, _NARG + rept _NARG + db \1 + shift + endr + db $FF + ENDM + ; Predef macro. add_predef: MACRO \1Predef:: -- cgit v1.3.1-sl0p From 38ea9cd829c51fbfd1e5e89e94c073ea1987948d Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 25 Apr 2016 22:01:13 -0500 Subject: Fix typo: ninetails.asm -> ninetales.asm --- data/baseStats/ninetails.asm | 28 ---------------------------- data/baseStats/ninetales.asm | 28 ++++++++++++++++++++++++++++ data/base_stats.asm | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 data/baseStats/ninetails.asm create mode 100644 data/baseStats/ninetales.asm diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm deleted file mode 100644 index e98028dc..00000000 --- a/data/baseStats/ninetails.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NINETALES ; pokedex id -db 73 ; base hp -db 76 ; base attack -db 75 ; base defense -db 100 ; base speed -db 100 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 75 ; catch rate -db 178 ; base exp yield -INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions -dw NinetalesPicFront -dw NinetalesPicBack -; attacks known at lvl 0 -db EMBER -db TAIL_WHIP -db QUICK_ATTACK -db ROAR -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/ninetales.asm b/data/baseStats/ninetales.asm new file mode 100644 index 00000000..e98028dc --- /dev/null +++ b/data/baseStats/ninetales.asm @@ -0,0 +1,28 @@ +db DEX_NINETALES ; pokedex id +db 73 ; base hp +db 76 ; base attack +db 75 ; base defense +db 100 ; base speed +db 100 ; base special +db FIRE ; species type 1 +db FIRE ; species type 2 +db 75 ; catch rate +db 178 ; base exp yield +INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions +dw NinetalesPicFront +dw NinetalesPicBack +; attacks known at lvl 0 +db EMBER +db TAIL_WHIP +db QUICK_ATTACK +db ROAR +db 0 ; growth rate +; learnset + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 +db 0 ; padding diff --git a/data/base_stats.asm b/data/base_stats.asm index d7d26533..a84693a4 100755 --- a/data/base_stats.asm +++ b/data/base_stats.asm @@ -35,7 +35,7 @@ INCLUDE "data/baseStats/nidoking.asm" INCLUDE "data/baseStats/clefairy.asm" INCLUDE "data/baseStats/clefable.asm" INCLUDE "data/baseStats/vulpix.asm" -INCLUDE "data/baseStats/ninetails.asm" +INCLUDE "data/baseStats/ninetales.asm" INCLUDE "data/baseStats/jigglypuff.asm" INCLUDE "data/baseStats/wigglytuff.asm" INCLUDE "data/baseStats/zubat.asm" -- cgit v1.3.1-sl0p From 93fe3064750c2b4ae6c243dafd9702c7248520c6 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 13 May 2016 17:58:34 -0400 Subject: Split default names strings into separate lines to make it less unpleasant to read --- engine/oak_speech2.asm | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 9b5622b8..fe0d6fa3 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -261,21 +261,39 @@ GetDefaultName: ; 6ad6 (1:6ad6) IF DEF(_RED) DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@RED@ASH@JACK@" + db "NEW NAME@" + db "RED@" + db "ASH@" + db "JACK@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@BLUE@GARY@JOHN@" + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@BLUE@GARY@JOHN@" + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@RED@ASH@JACK@" + db "NEW NAME@" + db "RED@" + db "ASH@" + db "JACK@" ENDC IF DEF(_YELLOW) DefaultNamesPlayerList: - db "NEW NAME@YELLOW@ASH@JACK@" + db "NEW NAME@" + db "YELLOW@" + db "ASH@" + db "JACK@" DefaultNamesRivalList: - db "NEW NAME@BLUE@GARY@JOHN@" + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" ENDC TextTerminator_6b20: ; 6b20 (1:6b20) -- cgit v1.3.1-sl0p From 3fe60f77935c0891bae2a10184ec85f0ca066111 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 13 May 2016 18:00:38 -0400 Subject: Remove the last remaining IF DEF(_YELLOW) --- data/mapObjects/pokemontower7.asm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index fd1fc884..b7826b73 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -6,18 +6,11 @@ PokemonTower7Object: ; 0x60ef6 (size=42) db $0 ; signs -IF DEF(_YELLOW) - db 3 ; objects - object SPRITE_JESSIE, $a 8, 8, STAY, DOWN, 1 - object SPRITE_JAMES, $b, 8, STAY, DOWN, 2 - object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3 -ELSE - db $4 ; objects + db 4 ; objects object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, OPP_ROCKET, $13 object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, OPP_ROCKET, $14 object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, OPP_ROCKET, $15 object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person -ENDC ; warp-to EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 -- cgit v1.3.1-sl0p From bbd3eac6106e8128aa09853ae6f2595684e123b1 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 13 May 2016 18:04:35 -0400 Subject: Finish reversion of .gb file extensions --- roms.md5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roms.md5 b/roms.md5 index 9b4b336b..c4128cfd 100644 --- a/roms.md5 +++ b/roms.md5 @@ -1,2 +1,2 @@ -3d45c1ee9abd5738df46d2bdda8b57dc pokered.gb -50927e843568814f7ed45ec4f944bd8b pokeblue.gb +3d45c1ee9abd5738df46d2bdda8b57dc pokered.gbc +50927e843568814f7ed45ec4f944bd8b pokeblue.gbc -- cgit v1.3.1-sl0p From b8dfee511453d322051f21bddc74c79307f23007 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 22 May 2016 11:40:49 -0400 Subject: dbw door tiles --- engine/overworld/doors.asm | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index 6b0c0464..3145c3c6 100755 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -26,32 +26,19 @@ IsPlayerStandingOnDoorTile: ; 1a609 (6:6609) ret DoorTileIDPointers: ; 1a62c (6:662c) - db OVERWORLD - dw OverworldDoorTileIDs - db FOREST - dw ForestDoorTileIDs - db MART - dw MartDoorTileIDs - db HOUSE - dw HouseDoorTileIDs - db FOREST_GATE - dw TilesetMuseumDoorTileIDs - db MUSEUM - dw TilesetMuseumDoorTileIDs - db GATE - dw TilesetMuseumDoorTileIDs - db SHIP - dw ShipDoorTileIDs - db LOBBY - dw LobbyDoorTileIDs - db MANSION - dw MansionDoorTileIDs - db LAB - dw LabDoorTileIDs - db FACILITY - dw FacilityDoorTileIDs - db PLATEAU - dw PlateauDoorTileIDs + dbw OVERWORLD, OverworldDoorTileIDs + dbw FOREST, ForestDoorTileIDs + dbw MART, MartDoorTileIDs + dbw HOUSE, HouseDoorTileIDs + dbw FOREST_GATE, TilesetMuseumDoorTileIDs + dbw MUSEUM, TilesetMuseumDoorTileIDs + dbw GATE, TilesetMuseumDoorTileIDs + dbw SHIP, ShipDoorTileIDs + dbw LOBBY, LobbyDoorTileIDs + dbw MANSION, MansionDoorTileIDs + dbw LAB, LabDoorTileIDs + dbw FACILITY, FacilityDoorTileIDs + dbw PLATEAU, PlateauDoorTileIDs db $ff OverworldDoorTileIDs: ; 1a654 (6:6654) -- cgit v1.3.1-sl0p From 0d687ba25ae223f6de2c69d46fd1c3df6ad52da3 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 09:08:40 -0400 Subject: TX_SFX_KEY_ITEM and `mapconst` macro --- constants.asm | 1 - constants/map_constants.asm | 506 +++++++++++----------- constants/map_dimensions.asm | 898 --------------------------------------- data/mapObjects/ceruleancity.asm | 12 +- data/town_map_entries.asm | 2 +- macros.asm | 5 +- scripts/blueshouse.asm | 2 +- scripts/oakslab.asm | 13 +- 8 files changed, 276 insertions(+), 1163 deletions(-) delete mode 100755 constants/map_dimensions.asm diff --git a/constants.asm b/constants.asm index 9f1491c8..8bca86eb 100644 --- a/constants.asm +++ b/constants.asm @@ -22,7 +22,6 @@ INCLUDE "constants/palette_constants.asm" INCLUDE "constants/evolution_constants.asm" INCLUDE "constants/list_constants.asm" INCLUDE "constants/map_constants.asm" -INCLUDE "constants/map_dimensions.asm" INCLUDE "constants/connection_constants.asm" INCLUDE "constants/hide_show_constants.asm" INCLUDE "constants/credits_constants.asm" diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 3bd79f3c..ad37e3cf 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1,253 +1,259 @@ -const_value = 0 +mapconst: MACRO + const \1 +\1_HEIGHT EQU \2 +\1_WIDTH EQU \3 +ENDM + + const_def + mapconst PALLET_TOWN, 9, 10 ; $00 + mapconst VIRIDIAN_CITY, 18, 20 ; $01 + mapconst PEWTER_CITY, 18, 20 ; $02 + mapconst CERULEAN_CITY, 18, 20 ; $03 + mapconst LAVENDER_TOWN, 9, 10 ; $04 + mapconst VERMILION_CITY, 18, 20 ; $05 + mapconst CELADON_CITY, 18, 25 ; $06 + mapconst FUCHSIA_CITY, 18, 20 ; $07 + mapconst CINNABAR_ISLAND, 9, 10 ; $08 + mapconst INDIGO_PLATEAU, 9, 10 ; $09 + mapconst SAFFRON_CITY, 18, 20 ; $0A + mapconst UNUSED_MAP_0B, 0, 0 ; $0B + mapconst ROUTE_1, 18, 10 ; $0C + mapconst ROUTE_2, 36, 10 ; $0D + mapconst ROUTE_3, 9, 35 ; $0E + mapconst ROUTE_4, 9, 45 ; $0F + mapconst ROUTE_5, 18, 10 ; $10 + mapconst ROUTE_6, 18, 10 ; $11 + mapconst ROUTE_7, 9, 10 ; $12 + mapconst ROUTE_8, 9, 30 ; $13 + mapconst ROUTE_9, 9, 30 ; $14 + mapconst ROUTE_10, 36, 10 ; $15 + mapconst ROUTE_11, 9, 30 ; $16 + mapconst ROUTE_12, 54, 10 ; $17 + mapconst ROUTE_13, 9, 30 ; $18 + mapconst ROUTE_14, 27, 10 ; $19 + mapconst ROUTE_15, 9, 30 ; $1A + mapconst ROUTE_16, 9, 20 ; $1B + mapconst ROUTE_17, 72, 10 ; $1C + mapconst ROUTE_18, 9, 25 ; $1D + mapconst ROUTE_19, 27, 10 ; $1E + mapconst ROUTE_20, 9, 50 ; $1F + mapconst ROUTE_21, 45, 10 ; $20 + mapconst ROUTE_22, 9, 20 ; $21 + mapconst ROUTE_23, 72, 10 ; $22 + mapconst ROUTE_24, 18, 10 ; $23 + mapconst ROUTE_25, 9, 30 ; $24 + mapconst REDS_HOUSE_1F, 4, 4 ; $25 + mapconst REDS_HOUSE_2F, 4, 4 ; $26 + mapconst BLUES_HOUSE, 4, 4 ; $27 + mapconst OAKS_LAB, 6, 5 ; $28 + mapconst VIRIDIAN_POKECENTER, 4, 7 ; $29 + mapconst VIRIDIAN_MART, 4, 4 ; $2A + mapconst VIRIDIAN_SCHOOL, 4, 4 ; $2B + mapconst VIRIDIAN_HOUSE, 4, 4 ; $2C + mapconst VIRIDIAN_GYM, 9, 10 ; $2D + mapconst DIGLETTS_CAVE_EXIT, 4, 4 ; $2E + mapconst VIRIDIAN_FOREST_EXIT, 4, 5 ; $2F + mapconst ROUTE_2_HOUSE, 4, 4 ; $30 + mapconst ROUTE_2_GATE, 4, 5 ; $31 + mapconst VIRIDIAN_FOREST_ENTRANCE, 4, 5 ; $32 + mapconst VIRIDIAN_FOREST, 24, 17 ; $33 + mapconst MUSEUM_1F, 4, 10 ; $34 + mapconst MUSEUM_2F, 4, 7 ; $35 + mapconst PEWTER_GYM, 7, 5 ; $36 + mapconst PEWTER_HOUSE_1, 4, 4 ; $37 + mapconst PEWTER_MART, 4, 4 ; $38 + mapconst PEWTER_HOUSE_2, 4, 4 ; $39 + mapconst PEWTER_POKECENTER, 4, 7 ; $3A + mapconst MT_MOON_1, 18, 20 ; $3B + mapconst MT_MOON_2, 14, 14 ; $3C + mapconst MT_MOON_3, 18, 20 ; $3D + mapconst TRASHED_HOUSE, 4, 4 ; $3E + mapconst CERULEAN_HOUSE_1, 4, 4 ; $3F + mapconst CERULEAN_POKECENTER, 4, 7 ; $40 + mapconst CERULEAN_GYM, 7, 5 ; $41 + mapconst BIKE_SHOP, 4, 4 ; $42 + mapconst CERULEAN_MART, 4, 4 ; $43 + mapconst MT_MOON_POKECENTER, 4, 7 ; $44 + mapconst TRASHED_HOUSE_COPY, 4, 4 ; $45 + mapconst ROUTE_5_GATE, 3, 4 ; $46 + mapconst PATH_ENTRANCE_ROUTE_5, 4, 4 ; $47 + mapconst DAYCAREM, 4, 4 ; $48 + mapconst ROUTE_6_GATE, 3, 4 ; $49 + mapconst PATH_ENTRANCE_ROUTE_6, 4, 4 ; $4A + mapconst PATH_ENTRANCE_ROUTE_6_COPY, 4, 4 ; $4B + mapconst ROUTE_7_GATE, 4, 3 ; $4C + mapconst PATH_ENTRANCE_ROUTE_7, 4, 4 ; $4D + mapconst PATH_ENTRANCE_ROUTE_7_COPY, 4, 4 ; $4E + mapconst ROUTE_8_GATE, 4, 3 ; $4F + mapconst PATH_ENTRANCE_ROUTE_8, 4, 4 ; $50 + mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51 + mapconst ROCK_TUNNEL_1, 18, 20 ; $52 + mapconst POWER_PLANT, 18, 20 ; $53 + mapconst ROUTE_11_GATE_1F, 5, 4 ; $54 + mapconst DIGLETTS_CAVE_ENTRANCE, 4, 4 ; $55 + mapconst ROUTE_11_GATE_2F, 4, 4 ; $56 + mapconst ROUTE_12_GATE_1F, 4, 5 ; $57 + mapconst BILLS_HOUSE, 4, 4 ; $58 + mapconst VERMILION_POKECENTER, 4, 7 ; $59 + mapconst POKEMON_FAN_CLUB, 4, 4 ; $5A + mapconst VERMILION_MART, 4, 4 ; $5B + mapconst VERMILION_GYM, 9, 5 ; $5C + mapconst VERMILION_HOUSE_1, 4, 4 ; $5D + mapconst VERMILION_DOCK, 6, 14 ; $5E + mapconst SS_ANNE_1, 9, 20 ; $5F + mapconst SS_ANNE_2, 9, 20 ; $60 + mapconst SS_ANNE_3, 3, 10 ; $61 + mapconst SS_ANNE_4, 4, 15 ; $62 + mapconst SS_ANNE_5, 7, 10 ; $63 + mapconst SS_ANNE_6, 8, 7 ; $64 + mapconst SS_ANNE_7, 4, 3 ; $65 + mapconst SS_ANNE_8, 8, 12 ; $66 + mapconst SS_ANNE_9, 8, 12 ; $67 + mapconst SS_ANNE_10, 8, 12 ; $68 + mapconst UNUSED_MAP_69, 0, 0 ; $69 + mapconst UNUSED_MAP_6A, 0, 0 ; $6A + mapconst UNUSED_MAP_6B, 0, 0 ; $6B + mapconst VICTORY_ROAD_1, 9, 10 ; $6C + mapconst UNUSED_MAP_6D, 0, 0 ; $6D + mapconst UNUSED_MAP_6E, 0, 0 ; $6E + mapconst UNUSED_MAP_6F, 0, 0 ; $6F + mapconst UNUSED_MAP_70, 0, 0 ; $70 + mapconst LANCES_ROOM, 13, 13 ; $71 + mapconst UNUSED_MAP_72, 0, 0 ; $72 + mapconst UNUSED_MAP_73, 0, 0 ; $73 + mapconst UNUSED_MAP_74, 0, 0 ; $74 + mapconst UNUSED_MAP_75, 0, 0 ; $75 + mapconst HALL_OF_FAME, 4, 5 ; $76 + mapconst UNDERGROUND_PATH_NS, 24, 4 ; $77 + mapconst CHAMPIONS_ROOM, 4, 4 ; $78 + mapconst UNDERGROUND_PATH_WE, 4, 25 ; $79 + mapconst CELADON_MART_1, 4, 10 ; $7A + mapconst CELADON_MART_2, 4, 10 ; $7B + mapconst CELADON_MART_3, 4, 10 ; $7C + mapconst CELADON_MART_4, 4, 10 ; $7D + mapconst CELADON_MART_ROOF, 4, 10 ; $7E + mapconst CELADON_MART_ELEVATOR, 2, 2 ; $7F + mapconst CELADON_MANSION_1, 6, 4 ; $80 + mapconst CELADON_MANSION_2, 6, 4 ; $81 + mapconst CELADON_MANSION_3, 6, 4 ; $82 + mapconst CELADON_MANSION_4, 6, 4 ; $83 + mapconst CELADON_MANSION_5, 4, 4 ; $84 + mapconst CELADON_POKECENTER, 4, 7 ; $85 + mapconst CELADON_GYM, 9, 5 ; $86 + mapconst GAME_CORNER, 9, 10 ; $87 + mapconst CELADON_MART_5, 4, 10 ; $88 + mapconst CELADON_PRIZE_ROOM, 4, 5 ; $89 + mapconst CELADON_DINER, 4, 5 ; $8A + mapconst CELADON_HOUSE, 4, 4 ; $8B + mapconst CELADON_HOTEL, 4, 7 ; $8C + mapconst LAVENDER_POKECENTER, 4, 7 ; $8D + mapconst POKEMONTOWER_1, 9, 10 ; $8E + mapconst POKEMONTOWER_2, 9, 10 ; $8F + mapconst POKEMONTOWER_3, 9, 10 ; $90 + mapconst POKEMONTOWER_4, 9, 10 ; $91 + mapconst POKEMONTOWER_5, 9, 10 ; $92 + mapconst POKEMONTOWER_6, 9, 10 ; $93 + mapconst POKEMONTOWER_7, 9, 10 ; $94 + mapconst LAVENDER_HOUSE_1, 4, 4 ; $95 + mapconst LAVENDER_MART, 4, 4 ; $96 + mapconst LAVENDER_HOUSE_2, 4, 4 ; $97 + mapconst FUCHSIA_MART, 4, 4 ; $98 + mapconst FUCHSIA_HOUSE_1, 4, 4 ; $99 + mapconst FUCHSIA_POKECENTER, 4, 7 ; $9A + mapconst FUCHSIA_HOUSE_2, 4, 5 ; $9B + mapconst SAFARI_ZONE_ENTRANCE, 3, 4 ; $9C + mapconst FUCHSIA_GYM, 9, 5 ; $9D + mapconst FUCHSIA_MEETING_ROOM, 4, 7 ; $9E + mapconst SEAFOAM_ISLANDS_2, 9, 15 ; $9F + mapconst SEAFOAM_ISLANDS_3, 9, 15 ; $A0 + mapconst SEAFOAM_ISLANDS_4, 9, 15 ; $A1 + mapconst SEAFOAM_ISLANDS_5, 9, 15 ; $A2 + mapconst VERMILION_HOUSE_2, 4, 4 ; $A3 + mapconst FUCHSIA_HOUSE_3, 4, 4 ; $A4 + mapconst MANSION_1, 14, 15 ; $A5 + mapconst CINNABAR_GYM, 9, 10 ; $A6 + mapconst CINNABAR_LAB_1, 4, 9 ; $A7 + mapconst CINNABAR_LAB_2, 4, 4 ; $A8 + mapconst CINNABAR_LAB_3, 4, 4 ; $A9 + mapconst CINNABAR_LAB_4, 4, 4 ; $AA + mapconst CINNABAR_POKECENTER, 4, 7 ; $AB + mapconst CINNABAR_MART, 4, 4 ; $AC + mapconst CINNABAR_MART_COPY, 4, 4 ; $AD + mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE + mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF + mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0 + mapconst FIGHTING_DOJO, 6, 5 ; $B1 + mapconst SAFFRON_GYM, 9, 10 ; $B2 + mapconst SAFFRON_HOUSE_1, 4, 4 ; $B3 + mapconst SAFFRON_MART, 4, 4 ; $B4 + mapconst SILPH_CO_1F, 9, 15 ; $B5 + mapconst SAFFRON_POKECENTER, 4, 7 ; $B6 + mapconst SAFFRON_HOUSE_2, 4, 4 ; $B7 + mapconst ROUTE_15_GATE_1F, 5, 4 ; $B8 + mapconst ROUTE_15_GATE_2F, 4, 4 ; $B9 + mapconst ROUTE_16_GATE_1F, 7, 4 ; $BA + mapconst ROUTE_16_GATE_2F, 4, 4 ; $BB + mapconst ROUTE_16_HOUSE, 4, 4 ; $BC + mapconst ROUTE_12_HOUSE, 4, 4 ; $BD + mapconst ROUTE_18_GATE_1F, 5, 4 ; $BE + mapconst ROUTE_18_GATE_2F, 4, 4 ; $BF + mapconst SEAFOAM_ISLANDS_1, 9, 15 ; $C0 + mapconst ROUTE_22_GATE, 4, 5 ; $C1 + mapconst VICTORY_ROAD_2, 9, 15 ; $C2 + mapconst ROUTE_12_GATE_2F, 4, 4 ; $C3 + mapconst VERMILION_HOUSE_3, 4, 4 ; $C4 + mapconst DIGLETTS_CAVE, 18, 20 ; $C5 + mapconst VICTORY_ROAD_3, 9, 15 ; $C6 + mapconst ROCKET_HIDEOUT_1, 14, 15 ; $C7 + mapconst ROCKET_HIDEOUT_2, 14, 15 ; $C8 + mapconst ROCKET_HIDEOUT_3, 14, 15 ; $C9 + mapconst ROCKET_HIDEOUT_4, 12, 15 ; $CA + mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB + mapconst UNUSED_MAP_CC, 0, 0 ; $CC + mapconst UNUSED_MAP_CD, 0, 0 ; $CD + mapconst UNUSED_MAP_CE, 0, 0 ; $CE + mapconst SILPH_CO_2F, 9, 15 ; $CF + mapconst SILPH_CO_3F, 9, 15 ; $D0 + mapconst SILPH_CO_4F, 9, 15 ; $D1 + mapconst SILPH_CO_5F, 9, 15 ; $D2 + mapconst SILPH_CO_6F, 9, 13 ; $D3 + mapconst SILPH_CO_7F, 9, 13 ; $D4 + mapconst SILPH_CO_8F, 9, 13 ; $D5 + mapconst MANSION_2, 14, 15 ; $D6 + mapconst MANSION_3, 9, 15 ; $D7 + mapconst MANSION_4, 14, 15 ; $D8 + mapconst SAFARI_ZONE_EAST, 13, 15 ; $D9 + mapconst SAFARI_ZONE_NORTH, 18, 20 ; $DA + mapconst SAFARI_ZONE_WEST, 13, 15 ; $DB + mapconst SAFARI_ZONE_CENTER, 13, 15 ; $DC + mapconst SAFARI_ZONE_REST_HOUSE_1, 4, 4 ; $DD + mapconst SAFARI_ZONE_SECRET_HOUSE, 4, 4 ; $DE + mapconst SAFARI_ZONE_REST_HOUSE_2, 4, 4 ; $DF + mapconst SAFARI_ZONE_REST_HOUSE_3, 4, 4 ; $E0 + mapconst SAFARI_ZONE_REST_HOUSE_4, 4, 4 ; $E1 + mapconst UNKNOWN_DUNGEON_2, 9, 15 ; $E2 + mapconst UNKNOWN_DUNGEON_3, 9, 15 ; $E3 + mapconst UNKNOWN_DUNGEON_1, 9, 15 ; $E4 + mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5 + mapconst CERULEAN_HOUSE_2, 4, 4 ; $E6 + mapconst UNUSED_MAP_E7, 0, 0 ; $E7 + mapconst ROCK_TUNNEL_2, 18, 20 ; $E8 + mapconst SILPH_CO_9F, 9, 13 ; $E9 + mapconst SILPH_CO_10F, 9, 8 ; $EA + mapconst SILPH_CO_11F, 9, 9 ; $EB + mapconst SILPH_CO_ELEVATOR, 2, 2 ; $EC + mapconst UNUSED_MAP_ED, 0, 0 ; $ED + mapconst UNUSED_MAP_EE, 0, 0 ; $EE + mapconst TRADE_CENTER, 4, 5 ; $EF + mapconst COLOSSEUM, 4, 5 ; $F0 + mapconst UNUSED_MAP_F1, 0, 0 ; $F1 + mapconst UNUSED_MAP_F2, 0, 0 ; $F2 + mapconst UNUSED_MAP_F3, 0, 0 ; $F3 + mapconst UNUSED_MAP_F4, 0, 0 ; $F4 + mapconst LORELEIS_ROOM, 6, 5 ; $F5 + mapconst BRUNOS_ROOM, 6, 5 ; $F6 + mapconst AGATHAS_ROOM, 6, 5 ; $F7 - const PALLET_TOWN ; $00 - const VIRIDIAN_CITY ; $01 - const PEWTER_CITY ; $02 - const CERULEAN_CITY ; $03 - const LAVENDER_TOWN ; $04 - const VERMILION_CITY ; $05 - const CELADON_CITY ; $06 - const FUCHSIA_CITY ; $07 - const CINNABAR_ISLAND ; $08 - const INDIGO_PLATEAU ; $09 - const SAFFRON_CITY ; $0A - const UNUSED_MAP_0B ; $0B - const ROUTE_1 ; $0C - const ROUTE_2 ; $0D - const ROUTE_3 ; $0E - const ROUTE_4 ; $0F - const ROUTE_5 ; $10 - const ROUTE_6 ; $11 - const ROUTE_7 ; $12 - const ROUTE_8 ; $13 - const ROUTE_9 ; $14 - const ROUTE_10 ; $15 - const ROUTE_11 ; $16 - const ROUTE_12 ; $17 - const ROUTE_13 ; $18 - const ROUTE_14 ; $19 - const ROUTE_15 ; $1A - const ROUTE_16 ; $1B - const ROUTE_17 ; $1C - const ROUTE_18 ; $1D - const ROUTE_19 ; $1E - const ROUTE_20 ; $1F - const ROUTE_21 ; $20 - const ROUTE_22 ; $21 - const ROUTE_23 ; $22 - const ROUTE_24 ; $23 - const ROUTE_25 ; $24 - const REDS_HOUSE_1F ; $25 - const REDS_HOUSE_2F ; $26 - const BLUES_HOUSE ; $27 - const OAKS_LAB ; $28 - const VIRIDIAN_POKECENTER ; $29 - const VIRIDIAN_MART ; $2A - const VIRIDIAN_SCHOOL ; $2B - const VIRIDIAN_HOUSE ; $2C - const VIRIDIAN_GYM ; $2D - const DIGLETTS_CAVE_EXIT ; $2E - const VIRIDIAN_FOREST_EXIT ; $2F - const ROUTE_2_HOUSE ; $30 - const ROUTE_2_GATE ; $31 - const VIRIDIAN_FOREST_ENTRANCE ; $32 - const VIRIDIAN_FOREST ; $33 - const MUSEUM_1F ; $34 - const MUSEUM_2F ; $35 - const PEWTER_GYM ; $36 - const PEWTER_HOUSE_1 ; $37 - const PEWTER_MART ; $38 - const PEWTER_HOUSE_2 ; $39 - const PEWTER_POKECENTER ; $3A - const MT_MOON_1 ; $3B - const MT_MOON_2 ; $3C - const MT_MOON_3 ; $3D - const TRASHED_HOUSE ; $3E - const CERULEAN_HOUSE ; $3F - const CERULEAN_POKECENTER ; $40 - const CERULEAN_GYM ; $41 - const BIKE_SHOP ; $42 - const CERULEAN_MART ; $43 - const MT_MOON_POKECENTER ; $44 - const TRASHED_HOUSE_COPY ; $45 - const ROUTE_5_GATE ; $46 - const PATH_ENTRANCE_ROUTE_5 ; $47 - const DAYCAREM ; $48 - const ROUTE_6_GATE ; $49 - const PATH_ENTRANCE_ROUTE_6 ; $4A - const PATH_ENTRANCE_ROUTE_6_COPY ; $4B - const ROUTE_7_GATE ; $4C - const PATH_ENTRANCE_ROUTE_7 ; $4D - const PATH_ENTRANCE_ROUTE_7_COPY ; $4E - const ROUTE_8_GATE ; $4F - const PATH_ENTRANCE_ROUTE_8 ; $50 - const ROCK_TUNNEL_POKECENTER ; $51 - const ROCK_TUNNEL_1 ; $52 - const POWER_PLANT ; $53 - const ROUTE_11_GATE_1F ; $54 - const DIGLETTS_CAVE_ENTRANCE ; $55 - const ROUTE_11_GATE_2F ; $56 - const ROUTE_12_GATE_1F ; $57 - const BILLS_HOUSE ; $58 - const VERMILION_POKECENTER ; $59 - const POKEMON_FAN_CLUB ; $5A - const VERMILION_MART ; $5B - const VERMILION_GYM ; $5C - const VERMILION_HOUSE_1 ; $5D - const VERMILION_DOCK ; $5E - const SS_ANNE_1 ; $5F - const SS_ANNE_2 ; $60 - const SS_ANNE_3 ; $61 - const SS_ANNE_4 ; $62 - const SS_ANNE_5 ; $63 - const SS_ANNE_6 ; $64 - const SS_ANNE_7 ; $65 - const SS_ANNE_8 ; $66 - const SS_ANNE_9 ; $67 - const SS_ANNE_10 ; $68 - const UNUSED_MAP_69 ; $69 - const UNUSED_MAP_6A ; $6A - const UNUSED_MAP_6B ; $6B - const VICTORY_ROAD_1 ; $6C - const UNUSED_MAP_6D ; $6D - const UNUSED_MAP_6E ; $6E - const UNUSED_MAP_6F ; $6F - const UNUSED_MAP_70 ; $70 - const LANCES_ROOM ; $71 - const UNUSED_MAP_72 ; $72 - const UNUSED_MAP_73 ; $73 - const UNUSED_MAP_74 ; $74 - const UNUSED_MAP_75 ; $75 - const HALL_OF_FAME ; $76 - const UNDERGROUND_PATH_NS ; $77 - const CHAMPIONS_ROOM ; $78 - const UNDERGROUND_PATH_WE ; $79 - const CELADON_MART_1 ; $7A - const CELADON_MART_2 ; $7B - const CELADON_MART_3 ; $7C - const CELADON_MART_4 ; $7D - const CELADON_MART_ROOF ; $7E - const CELADON_MART_ELEVATOR ; $7F - const CELADON_MANSION_1 ; $80 - const CELADON_MANSION_2 ; $81 - const CELADON_MANSION_3 ; $82 - const CELADON_MANSION_4 ; $83 - const CELADON_MANSION_5 ; $84 - const CELADON_POKECENTER ; $85 - const CELADON_GYM ; $86 - const GAME_CORNER ; $87 - const CELADON_MART_5 ; $88 - const CELADON_PRIZE_ROOM ; $89 - const CELADON_DINER ; $8A - const CELADON_HOUSE ; $8B - const CELADON_HOTEL ; $8C - const LAVENDER_POKECENTER ; $8D - const POKEMONTOWER_1 ; $8E - const POKEMONTOWER_2 ; $8F - const POKEMONTOWER_3 ; $90 - const POKEMONTOWER_4 ; $91 - const POKEMONTOWER_5 ; $92 - const POKEMONTOWER_6 ; $93 - const POKEMONTOWER_7 ; $94 - const LAVENDER_HOUSE_1 ; $95 - const LAVENDER_MART ; $96 - const LAVENDER_HOUSE_2 ; $97 - const FUCHSIA_MART ; $98 - const FUCHSIA_HOUSE_1 ; $99 - const FUCHSIA_POKECENTER ; $9A - const FUCHSIA_HOUSE_2 ; $9B - const SAFARI_ZONE_ENTRANCE ; $9C - const FUCHSIA_GYM ; $9D - const FUCHSIA_MEETING_ROOM ; $9E - const SEAFOAM_ISLANDS_2 ; $9F - const SEAFOAM_ISLANDS_3 ; $A0 - const SEAFOAM_ISLANDS_4 ; $A1 - const SEAFOAM_ISLANDS_5 ; $A2 - const VERMILION_HOUSE_2 ; $A3 - const FUCHSIA_HOUSE_3 ; $A4 - const MANSION_1 ; $A5 - const CINNABAR_GYM ; $A6 - const CINNABAR_LAB_1 ; $A7 - const CINNABAR_LAB_2 ; $A8 - const CINNABAR_LAB_3 ; $A9 - const CINNABAR_LAB_4 ; $AA - const CINNABAR_POKECENTER ; $AB - const CINNABAR_MART ; $AC - const CINNABAR_MART_COPY ; $AD - const INDIGO_PLATEAU_LOBBY ; $AE - const COPYCATS_HOUSE_1F ; $AF - const COPYCATS_HOUSE_2F ; $B0 - const FIGHTING_DOJO ; $B1 - const SAFFRON_GYM ; $B2 - const SAFFRON_HOUSE_1 ; $B3 - const SAFFRON_MART ; $B4 - const SILPH_CO_1F ; $B5 - const SAFFRON_POKECENTER ; $B6 - const SAFFRON_HOUSE_2 ; $B7 - const ROUTE_15_GATE_1F ; $B8 - const ROUTE_15_GATE_2F ; $B9 - const ROUTE_16_GATE_1F ; $BA - const ROUTE_16_GATE_2F ; $BB - const ROUTE_16_HOUSE ; $BC - const ROUTE_12_HOUSE ; $BD - const ROUTE_18_GATE_1F ; $BE - const ROUTE_18_GATE_2F ; $BF - const SEAFOAM_ISLANDS_1 ; $C0 - const ROUTE_22_GATE ; $C1 - const VICTORY_ROAD_2 ; $C2 - const ROUTE_12_GATE_2F ; $C3 - const VERMILION_HOUSE_3 ; $C4 - const DIGLETTS_CAVE ; $C5 - const VICTORY_ROAD_3 ; $C6 - const ROCKET_HIDEOUT_1 ; $C7 - const ROCKET_HIDEOUT_2 ; $C8 - const ROCKET_HIDEOUT_3 ; $C9 - const ROCKET_HIDEOUT_4 ; $CA - const ROCKET_HIDEOUT_ELEVATOR ; $CB - const UNUSED_MAP_CC ; $CC - const UNUSED_MAP_CD ; $CD - const UNUSED_MAP_CE ; $CE - const SILPH_CO_2F ; $CF - const SILPH_CO_3F ; $D0 - const SILPH_CO_4F ; $D1 - const SILPH_CO_5F ; $D2 - const SILPH_CO_6F ; $D3 - const SILPH_CO_7F ; $D4 - const SILPH_CO_8F ; $D5 - const MANSION_2 ; $D6 - const MANSION_3 ; $D7 - const MANSION_4 ; $D8 - const SAFARI_ZONE_EAST ; $D9 - const SAFARI_ZONE_NORTH ; $DA - const SAFARI_ZONE_WEST ; $DB - const SAFARI_ZONE_CENTER ; $DC - const SAFARI_ZONE_REST_HOUSE_1 ; $DD - const SAFARI_ZONE_SECRET_HOUSE ; $DE - const SAFARI_ZONE_REST_HOUSE_2 ; $DF - const SAFARI_ZONE_REST_HOUSE_3 ; $E0 - const SAFARI_ZONE_REST_HOUSE_4 ; $E1 - const UNKNOWN_DUNGEON_2 ; $E2 - const UNKNOWN_DUNGEON_3 ; $E3 - const UNKNOWN_DUNGEON_1 ; $E4 - const NAME_RATERS_HOUSE ; $E5 - const CERULEAN_HOUSE_3 ; $E6 - const UNUSED_MAP_E7 ; $E7 - const ROCK_TUNNEL_2 ; $E8 - const SILPH_CO_9F ; $E9 - const SILPH_CO_10F ; $EA - const SILPH_CO_11F ; $EB - const SILPH_CO_ELEVATOR ; $EC - const UNUSED_MAP_ED ; $ED - const UNUSED_MAP_EE ; $EE - const TRADE_CENTER ; $EF - const COLOSSEUM ; $F0 - const UNUSED_MAP_F1 ; $F1 - const UNUSED_MAP_F2 ; $F2 - const UNUSED_MAP_F3 ; $F3 - const UNUSED_MAP_F4 ; $F4 - const LORELEIS_ROOM ; $F5 - const BRUNOS_ROOM ; $F6 - const AGATHAS_ROOM ; $F7 IF DEF(_OPTION_BEACH_HOUSE) - const BEACH_HOUSE ; $F8 + mapconst BEACH_HOUSE, 4, 7 ; $F8 ENDC diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm deleted file mode 100755 index ad6caa23..00000000 --- a/constants/map_dimensions.asm +++ /dev/null @@ -1,898 +0,0 @@ -; Map sizes (y, x) - -; PalletTown_h map_id=0 -PALLET_TOWN_HEIGHT EQU $09 -PALLET_TOWN_WIDTH EQU $0a - -; ViridianCity_h map_id=1 -VIRIDIAN_CITY_HEIGHT EQU $12 -VIRIDIAN_CITY_WIDTH EQU $14 - -; PewterCity_h map_id=2 -PEWTER_CITY_HEIGHT EQU $12 -PEWTER_CITY_WIDTH EQU $14 - -; CeruleanCity_h map_id=3 -CERULEAN_CITY_HEIGHT EQU $12 -CERULEAN_CITY_WIDTH EQU $14 - -; LavenderTown_h map_id=4 -LAVENDER_TOWN_HEIGHT EQU $09 -LAVENDER_TOWN_WIDTH EQU $0a - -; VermilionCity_h map_id=5 -VERMILION_CITY_HEIGHT EQU $12 -VERMILION_CITY_WIDTH EQU $14 - -; CeladonCity_h map_id=6 -CELADON_CITY_HEIGHT EQU $12 -CELADON_CITY_WIDTH EQU $19 - -; FuchsiaCity_h map_id=7 -FUCHSIA_CITY_HEIGHT EQU $12 -FUCHSIA_CITY_WIDTH EQU $14 - -; CinnabarIsland_h map_id=8 -CINNABAR_ISLAND_HEIGHT EQU $09 -CINNABAR_ISLAND_WIDTH EQU $0a - -; IndigoPlateau_h map_id=9 -INDIGO_PLATEAU_HEIGHT EQU $09 -INDIGO_PLATEAU_WIDTH EQU $0a - -; SaffronCity_h map_id=10 -SAFFRON_CITY_HEIGHT EQU $12 -SAFFRON_CITY_WIDTH EQU $14 - -; Route1_h map_id=12 -ROUTE_1_HEIGHT EQU $12 -ROUTE_1_WIDTH EQU $0a - -; Route2_h map_id=13 -ROUTE_2_HEIGHT EQU $24 -ROUTE_2_WIDTH EQU $0a - -; Route3_h map_id=14 -ROUTE_3_HEIGHT EQU $09 -ROUTE_3_WIDTH EQU $23 - -; Route4_h map_id=15 -ROUTE_4_HEIGHT EQU $09 -ROUTE_4_WIDTH EQU $2d - -; Route5_h map_id=16 -ROUTE_5_HEIGHT EQU $12 -ROUTE_5_WIDTH EQU $0a - -; Route6_h map_id=17 -ROUTE_6_HEIGHT EQU $12 -ROUTE_6_WIDTH EQU $0a - -; Route7_h map_id=18 -ROUTE_7_HEIGHT EQU $09 -ROUTE_7_WIDTH EQU $0a - -; Route8_h map_id=19 -ROUTE_8_HEIGHT EQU $09 -ROUTE_8_WIDTH EQU $1e - -; Route9_h map_id=20 -ROUTE_9_HEIGHT EQU $09 -ROUTE_9_WIDTH EQU $1e - -; Route10_h map_id=21 -ROUTE_10_HEIGHT EQU $24 -ROUTE_10_WIDTH EQU $0a - -; Route11_h map_id=22 -ROUTE_11_HEIGHT EQU $09 -ROUTE_11_WIDTH EQU $1e - -; Route12_h map_id=23 -ROUTE_12_HEIGHT EQU $36 -ROUTE_12_WIDTH EQU $0a - -; Route13_h map_id=24 -ROUTE_13_HEIGHT EQU $09 -ROUTE_13_WIDTH EQU $1e - -; Route14_h map_id=25 -ROUTE_14_HEIGHT EQU $1b -ROUTE_14_WIDTH EQU $0a - -; Route15_h map_id=26 -ROUTE_15_HEIGHT EQU $09 -ROUTE_15_WIDTH EQU $1e - -; Route16_h map_id=27 -ROUTE_16_HEIGHT EQU $09 -ROUTE_16_WIDTH EQU $14 - -; Route17_h map_id=28 -ROUTE_17_HEIGHT EQU $48 -ROUTE_17_WIDTH EQU $0a - -; Route18_h map_id=29 -ROUTE_18_HEIGHT EQU $09 -ROUTE_18_WIDTH EQU $19 - -; Route19_h map_id=30 -ROUTE_19_HEIGHT EQU $1b -ROUTE_19_WIDTH EQU $0a - -; Route20_h map_id=31 -ROUTE_20_HEIGHT EQU $09 -ROUTE_20_WIDTH EQU $32 - -; Route21_h map_id=32 -ROUTE_21_HEIGHT EQU $2d -ROUTE_21_WIDTH EQU $0a - -; Route22_h map_id=33 -ROUTE_22_HEIGHT EQU $09 -ROUTE_22_WIDTH EQU $14 - -; Route23_h map_id=34 -ROUTE_23_HEIGHT EQU $48 -ROUTE_23_WIDTH EQU $0a - -; Route24_h map_id=35 -ROUTE_24_HEIGHT EQU $12 -ROUTE_24_WIDTH EQU $0a - -; Route25_h map_id=36 -ROUTE_25_HEIGHT EQU $09 -ROUTE_25_WIDTH EQU $1e - -; RedsHouse1F_h map_id=37 -REDS_HOUSE_1F_HEIGHT EQU $04 -REDS_HOUSE_1F_WIDTH EQU $04 - -; RedsHouse2F_h map_id=38 -REDS_HOUSE_2F_HEIGHT EQU $04 -REDS_HOUSE_2F_WIDTH EQU $04 - -; BluesHouse_h map_id=39 -BLUES_HOUSE_HEIGHT EQU $04 -BLUES_HOUSE_WIDTH EQU $04 - -; OaksLab_h map_id=40 -OAKS_LAB_HEIGHT EQU $06 -OAKS_LAB_WIDTH EQU $05 - -; ViridianPokeCenter_h map_id=41 -VIRIDIAN_POKECENTER_HEIGHT EQU $04 -VIRIDIAN_POKECENTER_WIDTH EQU $07 - -; ViridianMart_h map_id=42 -VIRIDIAN_MART_HEIGHT EQU $04 -VIRIDIAN_MART_WIDTH EQU $04 - -; School_h map_id=43 -VIRIDIAN_SCHOOL_HEIGHT EQU $04 -VIRIDIAN_SCHOOL_WIDTH EQU $04 - -; ViridianHouse_h map_id=44 -VIRIDIAN_HOUSE_HEIGHT EQU $04 -VIRIDIAN_HOUSE_WIDTH EQU $04 - -; ViridianGym_h map_id=45 -VIRIDIAN_GYM_HEIGHT EQU $09 -VIRIDIAN_GYM_WIDTH EQU $0a - -; DiglettsCaveRoute2_h map_id=46 -DIGLETTS_CAVE_EXIT_HEIGHT EQU $04 -DIGLETTS_CAVE_EXIT_WIDTH EQU $04 - -; ViridianForestExit_h map_id=47 -VIRIDIAN_FOREST_EXIT_HEIGHT EQU $04 -VIRIDIAN_FOREST_EXIT_WIDTH EQU $05 - -; Route2House_h map_id=48 -ROUTE_2_HOUSE_HEIGHT EQU $04 -ROUTE_2_HOUSE_WIDTH EQU $04 - -; Route2Gate_h map_id=49 -ROUTE_2_GATE_HEIGHT EQU $04 -ROUTE_2_GATE_WIDTH EQU $05 - -; ViridianForestEntrance_h map_id=50 -VIRIDIAN_FOREST_ENTRANCE_HEIGHT EQU $04 -VIRIDIAN_FOREST_ENTRANCE_WIDTH EQU $05 - -; ViridianForest_h map_id=51 -VIRIDIAN_FOREST_HEIGHT EQU $18 -VIRIDIAN_FOREST_WIDTH EQU $11 - -; MuseumF1_h map_id=52 -MUSEUM_1F_HEIGHT EQU $04 -MUSEUM_1F_WIDTH EQU $0a - -; MuseumF2_h map_id=53 -MUSEUM_2F_HEIGHT EQU $04 -MUSEUM_2F_WIDTH EQU $07 - -; PewterGym_h map_id=54 -PEWTER_GYM_HEIGHT EQU $07 -PEWTER_GYM_WIDTH EQU $05 - -; PewterHouse1_h map_id=55 -PEWTER_HOUSE_1_HEIGHT EQU $04 -PEWTER_HOUSE_1_WIDTH EQU $04 - -; PewterMart_h map_id=56 -PEWTER_MART_HEIGHT EQU $04 -PEWTER_MART_WIDTH EQU $04 - -; PewterHouse2_h map_id=57 -PEWTER_HOUSE_2_HEIGHT EQU $04 -PEWTER_HOUSE_2_WIDTH EQU $04 - -; PewterPokecenter_h map_id=58 -PEWTER_POKECENTER_HEIGHT EQU $04 -PEWTER_POKECENTER_WIDTH EQU $07 - -; MtMoon1_h map_id=59 -MT_MOON_1_HEIGHT EQU $12 -MT_MOON_1_WIDTH EQU $14 - -; MtMoon2_h map_id=60 -MT_MOON_2_HEIGHT EQU $0e -MT_MOON_2_WIDTH EQU $0e - -; MtMoon3_h map_id=61 -MT_MOON_3_HEIGHT EQU $12 -MT_MOON_3_WIDTH EQU $14 - -; CeruleanHouseTrashed_h map_id=62 -TRASHED_HOUSE_HEIGHT EQU $04 -TRASHED_HOUSE_WIDTH EQU $04 - -; CeruleanHouse1_h map_id=63 -CERULEAN_HOUSE_1_HEIGHT EQU $04 -CERULEAN_HOUSE_1_WIDTH EQU $04 - -; CeruleanPokecenter_h map_id=64 -CERULEAN_POKECENTER_HEIGHT EQU $04 -CERULEAN_POKECENTER_WIDTH EQU $07 - -; CeruleanGym_h map_id=65 -CERULEAN_GYM_HEIGHT EQU $07 -CERULEAN_GYM_WIDTH EQU $05 - -; BikeShop_h map_id=66 -BIKE_SHOP_HEIGHT EQU $04 -BIKE_SHOP_WIDTH EQU $04 - -; CeruleanMart_h map_id=67 -CERULEAN_MART_HEIGHT EQU $04 -CERULEAN_MART_WIDTH EQU $04 - -; MtMoonPokecenter_h map_id=68 -MT_MOON_POKECENTER_HEIGHT EQU $04 -MT_MOON_POKECENTER_WIDTH EQU $07 - -; Route5Gate_h map_id=70 -ROUTE_5_GATE_HEIGHT EQU $03 -ROUTE_5_GATE_WIDTH EQU $04 - -; UndergroundTunnelEntranceRoute5_h map_id=71 -PATH_ENTRANCE_ROUTE_5_HEIGHT EQU $04 -PATH_ENTRANCE_ROUTE_5_WIDTH EQU $04 - -; DayCareM_h map_id=72 -DAYCAREM_HEIGHT EQU $04 -DAYCAREM_WIDTH EQU $04 - -; Route6Gate_h map_id=73 -ROUTE_6_GATE_HEIGHT EQU $03 -ROUTE_6_GATE_WIDTH EQU $04 - -; UndergroundTunnelEntranceRoute6_h map_id=74 -PATH_ENTRANCE_ROUTE_6_HEIGHT EQU $04 -PATH_ENTRANCE_ROUTE_6_WIDTH EQU $04 - -; Route7Gate_h map_id=76 -ROUTE_7_GATE_HEIGHT EQU $04 -ROUTE_7_GATE_WIDTH EQU $03 - -; UndergroundPathEntranceRoute7_h map_id=77 -PATH_ENTRANCE_ROUTE_7_HEIGHT EQU $04 -PATH_ENTRANCE_ROUTE_7_WIDTH EQU $04 - -; UndergroundPathEntranceRoute7Copy_h map_id=78 -PATH_ENTRANCE_ROUTE_7_COPY_HEIGHT EQU $04 -PATH_ENTRANCE_ROUTE_7_COPY_WIDTH EQU $04 - -; Route8Gate_h map_id=79 -ROUTE_8_GATE_HEIGHT EQU $04 -ROUTE_8_GATE_WIDTH EQU $03 - -; UndergroundPathEntranceRoute8_h map_id=80 -PATH_ENTRANCE_ROUTE_8_HEIGHT EQU $04 -PATH_ENTRANCE_ROUTE_8_WIDTH EQU $04 - -; RockTunnelPokecenter_h map_id=81 -ROCK_TUNNEL_POKECENTER_HEIGHT EQU $04 -ROCK_TUNNEL_POKECENTER_WIDTH EQU $07 - -; RockTunnel1_h map_id=82 -ROCK_TUNNEL_1_HEIGHT EQU $12 -ROCK_TUNNEL_1_WIDTH EQU $14 - -; PowerPlant_h map_id=83 -POWER_PLANT_HEIGHT EQU $12 -POWER_PLANT_WIDTH EQU $14 - -; Route11Gate_h map_id=84 -ROUTE_11_GATE_1F_HEIGHT EQU $05 -ROUTE_11_GATE_1F_WIDTH EQU $04 - -; DiglettsCaveEntranceRoute11_h map_id=85 -DIGLETTS_CAVE_ENTRANCE_HEIGHT EQU $04 -DIGLETTS_CAVE_ENTRANCE_WIDTH EQU $04 - -; Route11GateUpstairs_h map_id=86 -ROUTE_11_GATE_2F_HEIGHT EQU $04 -ROUTE_11_GATE_2F_WIDTH EQU $04 - -; Route12Gate_h map_id=87 -ROUTE_12_GATE_1F_HEIGHT EQU $04 -ROUTE_12_GATE_1F_WIDTH EQU $05 - -; BillsHouse_h map_id=88 -BILLS_HOUSE_HEIGHT EQU $04 -BILLS_HOUSE_WIDTH EQU $04 - -; VermilionPokecenter_h map_id=89 -VERMILION_POKECENTER_HEIGHT EQU $04 -VERMILION_POKECENTER_WIDTH EQU $07 - -; FanClub_h map_id=90 -POKEMON_FAN_CLUB_HEIGHT EQU $04 -POKEMON_FAN_CLUB_WIDTH EQU $04 - -; VermilionMart_h map_id=91 -VERMILION_MART_HEIGHT EQU $04 -VERMILION_MART_WIDTH EQU $04 - -; VermilionGym_h map_id=92 -VERMILION_GYM_HEIGHT EQU $09 -VERMILION_GYM_WIDTH EQU $05 - -; VermilionHouse1_h map_id=93 -VERMILION_HOUSE_1_HEIGHT EQU $04 -VERMILION_HOUSE_1_WIDTH EQU $04 - -; VermilionDock_h map_id=94 -VERMILION_DOCK_HEIGHT EQU $06 -VERMILION_DOCK_WIDTH EQU $0e - -; SSAnne1_h map_id=95 -SS_ANNE_1_HEIGHT EQU $09 -SS_ANNE_1_WIDTH EQU $14 - -; SSAnne2_h map_id=96 -SS_ANNE_2_HEIGHT EQU $09 -SS_ANNE_2_WIDTH EQU $14 - -; SSAnne3_h map_id=97 -SS_ANNE_3_HEIGHT EQU $03 -SS_ANNE_3_WIDTH EQU $0a - -; SSAnne4_h map_id=98 -SS_ANNE_4_HEIGHT EQU $04 -SS_ANNE_4_WIDTH EQU $0f - -; SSAnne5_h map_id=99 -SS_ANNE_5_HEIGHT EQU $07 -SS_ANNE_5_WIDTH EQU $0a - -; SSAnne6_h map_id=100 -SS_ANNE_6_HEIGHT EQU $08 -SS_ANNE_6_WIDTH EQU $07 - -; SSAnne7_h map_id=101 -SS_ANNE_7_HEIGHT EQU $04 -SS_ANNE_7_WIDTH EQU $03 - -; SSAnne8_h map_id=102 -SS_ANNE_8_HEIGHT EQU $08 -SS_ANNE_8_WIDTH EQU $0c - -; SSAnne9_h map_id=103 -SS_ANNE_9_HEIGHT EQU $08 -SS_ANNE_9_WIDTH EQU $0c - -; SSAnne10_h map_id=104 -SS_ANNE_10_HEIGHT EQU $08 -SS_ANNE_10_WIDTH EQU $0c - -; VictoryRoad1_h map_id=108 -VICTORY_ROAD_1_HEIGHT EQU $09 -VICTORY_ROAD_1_WIDTH EQU $0a - -; Lance_h map_id=113 -LANCES_ROOM_HEIGHT EQU $0d -LANCES_ROOM_WIDTH EQU $0d - -; HallofFameRoom_h map_id=118 -HALL_OF_FAME_HEIGHT EQU $04 -HALL_OF_FAME_WIDTH EQU $05 - -; UndergroundPathNS_h map_id=119 -UNDERGROUND_PATH_NS_HEIGHT EQU $18 -UNDERGROUND_PATH_NS_WIDTH EQU $04 - -; Gary_h map_id=120 -CHAMPIONS_ROOM_HEIGHT EQU $04 -CHAMPIONS_ROOM_WIDTH EQU $04 - -; UndergroundPathWE_h map_id=121 -UNDERGROUND_PATH_WE_HEIGHT EQU $04 -UNDERGROUND_PATH_WE_WIDTH EQU $19 - -; CeladonMart1_h map_id=122 -CELADON_MART_1_HEIGHT EQU $04 -CELADON_MART_1_WIDTH EQU $0a - -; CeladonMart2_h map_id=123 -CELADON_MART_2_HEIGHT EQU $04 -CELADON_MART_2_WIDTH EQU $0a - -; CeladonMart3_h map_id=124 -CELADON_MART_3_HEIGHT EQU $04 -CELADON_MART_3_WIDTH EQU $0a - -; CeladonMart4_h map_id=125 -CELADON_MART_4_HEIGHT EQU $04 -CELADON_MART_4_WIDTH EQU $0a - -; CeladonMartRoof_h map_id=126 -CELADON_MART_ROOF_HEIGHT EQU $04 -CELADON_MART_ROOF_WIDTH EQU $0a - -; CeladonMartElevator_h map_id=127 -CELADON_MART_ELEVATOR_HEIGHT EQU $02 -CELADON_MART_ELEVATOR_WIDTH EQU $02 - -; CeladonMansion1_h map_id=128 -CELADON_MANSION_1_HEIGHT EQU $06 -CELADON_MANSION_1_WIDTH EQU $04 - -; CeladonMansion2_h map_id=129 -CELADON_MANSION_2_HEIGHT EQU $06 -CELADON_MANSION_2_WIDTH EQU $04 - -; CeladonMansion3_h map_id=130 -CELADON_MANSION_3_HEIGHT EQU $06 -CELADON_MANSION_3_WIDTH EQU $04 - -; CeladonMansion4_h map_id=131 -CELADON_MANSION_4_HEIGHT EQU $06 -CELADON_MANSION_4_WIDTH EQU $04 - -; CeladonMansion5_h map_id=132 -CELADON_MANSION_5_HEIGHT EQU $04 -CELADON_MANSION_5_WIDTH EQU $04 - -; CeladonPokecenter_h map_id=133 -CELADON_POKECENTER_HEIGHT EQU $04 -CELADON_POKECENTER_WIDTH EQU $07 - -; CeladonGym_h map_id=134 -CELADON_GYM_HEIGHT EQU $09 -CELADON_GYM_WIDTH EQU $05 - -; CeladonGameCorner_h map_id=135 -GAME_CORNER_HEIGHT EQU $09 -GAME_CORNER_WIDTH EQU $0a - -; CeladonMart5_h map_id=136 -CELADON_MART_5_HEIGHT EQU $04 -CELADON_MART_5_WIDTH EQU $0a - -; CeladonPrizeRoom_h map_id=137 -CELADON_PRIZE_ROOM_HEIGHT EQU $04 -CELADON_PRIZE_ROOM_WIDTH EQU $05 - -; CeladonDiner_h map_id=138 -CELADON_DINER_HEIGHT EQU $04 -CELADON_DINER_WIDTH EQU $05 - -; CeladonHouse_h map_id=139 -CELADON_HOUSE_HEIGHT EQU $04 -CELADON_HOUSE_WIDTH EQU $04 - -; CeladonHotel_h map_id=140 -CELADON_HOTEL_HEIGHT EQU $04 -CELADON_HOTEL_WIDTH EQU $07 - -; LavenderPokecenter_h map_id=141 -LAVENDER_POKECENTER_HEIGHT EQU $04 -LAVENDER_POKECENTER_WIDTH EQU $07 - -; PokemonTower1_h map_id=142 -POKEMONTOWER_1_HEIGHT EQU $09 -POKEMONTOWER_1_WIDTH EQU $0a - -; PokemonTower2_h map_id=143 -POKEMONTOWER_2_HEIGHT EQU $09 -POKEMONTOWER_2_WIDTH EQU $0a - -; PokemonTower3_h map_id=144 -POKEMONTOWER_3_HEIGHT EQU $09 -POKEMONTOWER_3_WIDTH EQU $0a - -; PokemonTower4_h map_id=145 -POKEMONTOWER_4_HEIGHT EQU $09 -POKEMONTOWER_4_WIDTH EQU $0a - -; PokemonTower5_h map_id=146 -POKEMONTOWER_5_HEIGHT EQU $09 -POKEMONTOWER_5_WIDTH EQU $0a - -; PokemonTower6_h map_id=147 -POKEMONTOWER_6_HEIGHT EQU $09 -POKEMONTOWER_6_WIDTH EQU $0a - -; PokemonTower7_h map_id=148 -POKEMONTOWER_7_HEIGHT EQU $09 -POKEMONTOWER_7_WIDTH EQU $0a - -; LavenderHouse1_h map_id=149 -LAVENDER_HOUSE_1_HEIGHT EQU $04 -LAVENDER_HOUSE_1_WIDTH EQU $04 - -; LavenderMart_h map_id=150 -LAVENDER_MART_HEIGHT EQU $04 -LAVENDER_MART_WIDTH EQU $04 - -; LavenderHouse2_h map_id=151 -LAVENDER_HOUSE_2_HEIGHT EQU $04 -LAVENDER_HOUSE_2_WIDTH EQU $04 - -; FuchsiaMart_h map_id=152 -FUCHSIA_MART_HEIGHT EQU $04 -FUCHSIA_MART_WIDTH EQU $04 - -; FuchsiaHouse1_h map_id=153 -FUCHSIA_HOUSE_1_HEIGHT EQU $04 -FUCHSIA_HOUSE_1_WIDTH EQU $04 - -; FuchsiaPokecenter_h map_id=154 -FUCHSIA_POKECENTER_HEIGHT EQU $04 -FUCHSIA_POKECENTER_WIDTH EQU $07 - -; FuchsiaHouse2_h map_id=155 -FUCHSIA_HOUSE_2_HEIGHT EQU $04 -FUCHSIA_HOUSE_2_WIDTH EQU $05 - -; SafariZoneEntrance_h map_id=156 -SAFARI_ZONE_ENTRANCE_HEIGHT EQU $03 -SAFARI_ZONE_ENTRANCE_WIDTH EQU $04 - -; FuchsiaGym_h map_id=157 -FUCHSIA_GYM_HEIGHT EQU $09 -FUCHSIA_GYM_WIDTH EQU $05 - -; FuchsiaMeetingRoom_h map_id=158 -FUCHSIA_MEETING_ROOM_HEIGHT EQU $04 -FUCHSIA_MEETING_ROOM_WIDTH EQU $07 - -; SeafoamIslands2_h map_id=159 -SEAFOAM_ISLANDS_2_HEIGHT EQU $09 -SEAFOAM_ISLANDS_2_WIDTH EQU $0f - -; SeafoamIslands3_h map_id=160 -SEAFOAM_ISLANDS_3_HEIGHT EQU $09 -SEAFOAM_ISLANDS_3_WIDTH EQU $0f - -; SeafoamIslands4_h map_id=161 -SEAFOAM_ISLANDS_4_HEIGHT EQU $09 -SEAFOAM_ISLANDS_4_WIDTH EQU $0f - -; SeafoamIslands5_h map_id=162 -SEAFOAM_ISLANDS_5_HEIGHT EQU $09 -SEAFOAM_ISLANDS_5_WIDTH EQU $0f - -; VermilionHouse2_h map_id=163 -VERMILION_HOUSE_2_HEIGHT EQU $04 -VERMILION_HOUSE_2_WIDTH EQU $04 - -; FuchsiaHouse3_h map_id=164 -FUCHSIA_HOUSE_3_HEIGHT EQU $04 -FUCHSIA_HOUSE_3_WIDTH EQU $04 - -; Mansion1_h map_id=165 -MANSION_1_HEIGHT EQU $0e -MANSION_1_WIDTH EQU $0f - -; CinnabarGym_h map_id=166 -CINNABAR_GYM_HEIGHT EQU $09 -CINNABAR_GYM_WIDTH EQU $0a - -; Lab1_h map_id=167 -CINNABAR_LAB_1_HEIGHT EQU $04 -CINNABAR_LAB_1_WIDTH EQU $09 - -; Lab2_h map_id=168 -CINNABAR_LAB_2_HEIGHT EQU $04 -CINNABAR_LAB_2_WIDTH EQU $04 - -; Lab3_h map_id=169 -CINNABAR_LAB_3_HEIGHT EQU $04 -CINNABAR_LAB_3_WIDTH EQU $04 - -; Lab4_h map_id=170 -CINNABAR_LAB_4_HEIGHT EQU $04 -CINNABAR_LAB_4_WIDTH EQU $04 - -; CinnabarPokecenter_h map_id=171 -CINNABAR_POKECENTER_HEIGHT EQU $04 -CINNABAR_POKECENTER_WIDTH EQU $07 - -; CinnabarMart_h map_id=172 -CINNABAR_MART_HEIGHT EQU $04 -CINNABAR_MART_WIDTH EQU $04 - -; IndigoPlateauLobby_h map_id=174 -INDIGO_PLATEAU_LOBBY_HEIGHT EQU $06 -INDIGO_PLATEAU_LOBBY_WIDTH EQU $08 - -; CopycatsHouse1F_h map_id=175 -COPYCATS_HOUSE_1F_HEIGHT EQU $04 -COPYCATS_HOUSE_1F_WIDTH EQU $04 - -; CopycatsHouse2F_h map_id=176 -COPYCATS_HOUSE_2F_HEIGHT EQU $04 -COPYCATS_HOUSE_2F_WIDTH EQU $04 - -; FightingDojo_h map_id=177 -FIGHTING_DOJO_HEIGHT EQU $06 -FIGHTING_DOJO_WIDTH EQU $05 - -; SaffronGym_h map_id=178 -SAFFRON_GYM_HEIGHT EQU $09 -SAFFRON_GYM_WIDTH EQU $0a - -; SaffronHouse1_h map_id=179 -SAFFRON_HOUSE_1_HEIGHT EQU $04 -SAFFRON_HOUSE_1_WIDTH EQU $04 - -; SaffronMart_h map_id=180 -SAFFRON_MART_HEIGHT EQU $04 -SAFFRON_MART_WIDTH EQU $04 - -; SilphCo1_h map_id=181 -SILPH_CO_1F_HEIGHT EQU $09 -SILPH_CO_1F_WIDTH EQU $0f - -; SaffronPokecenter_h map_id=182 -SAFFRON_POKECENTER_HEIGHT EQU $04 -SAFFRON_POKECENTER_WIDTH EQU $07 - -; SaffronHouse2_h map_id=183 -SAFFRON_HOUSE_2_HEIGHT EQU $04 -SAFFRON_HOUSE_2_WIDTH EQU $04 - -; Route15Gate1F_h map_id=184 -ROUTE_15_GATE_1F_HEIGHT EQU $05 -ROUTE_15_GATE_1F_WIDTH EQU $04 - -; Route15GateUpstairs_h map_id=185 -ROUTE_15_GATE_2F_HEIGHT EQU $04 -ROUTE_15_GATE_2F_WIDTH EQU $04 - -; Route16GateMap_h map_id=186 -ROUTE_16_GATE_1F_HEIGHT EQU $07 -ROUTE_16_GATE_1F_WIDTH EQU $04 - -; Route16GateUpstairs_h map_id=187 -ROUTE_16_GATE_2F_HEIGHT EQU $04 -ROUTE_16_GATE_2F_WIDTH EQU $04 - -; Route16House_h map_id=188 -ROUTE_16_HOUSE_HEIGHT EQU $04 -ROUTE_16_HOUSE_WIDTH EQU $04 - -; Route12House_h map_id=189 -ROUTE_12_HOUSE_HEIGHT EQU $04 -ROUTE_12_HOUSE_WIDTH EQU $04 - -; Route18Gate_h map_id=190 -ROUTE_18_GATE_1F_HEIGHT EQU $05 -ROUTE_18_GATE_1F_WIDTH EQU $04 - -; Route18GateHeader_h map_id=191 -ROUTE_18_GATE_2F_HEIGHT EQU $04 -ROUTE_18_GATE_2F_WIDTH EQU $04 - -; SeafoamIslands1_h map_id=192 -SEAFOAM_ISLANDS_1_HEIGHT EQU $09 -SEAFOAM_ISLANDS_1_WIDTH EQU $0f - -; Route22Gate_h map_id=193 -ROUTE_22_GATE_HEIGHT EQU $04 -ROUTE_22_GATE_WIDTH EQU $05 - -; VictoryRoad2_h map_id=194 -VICTORY_ROAD_2_HEIGHT EQU $09 -VICTORY_ROAD_2_WIDTH EQU $0f - -; Route12GateUpstairs_h map_id=195 -ROUTE_12_GATE_2F_HEIGHT EQU $04 -ROUTE_12_GATE_2F_WIDTH EQU $04 - -; VermilionHouse3_h map_id=196 -VERMILION_HOUSE_3_HEIGHT EQU $04 -VERMILION_HOUSE_3_WIDTH EQU $04 - -; DiglettsCave_h map_id=197 -DIGLETTS_CAVE_HEIGHT EQU $12 -DIGLETTS_CAVE_WIDTH EQU $14 - -; VictoryRoad3_h map_id=198 -VICTORY_ROAD_3_HEIGHT EQU $09 -VICTORY_ROAD_3_WIDTH EQU $0f - -; RocketHideout1_h map_id=199 -ROCKET_HIDEOUT_1_HEIGHT EQU $0e -ROCKET_HIDEOUT_1_WIDTH EQU $0f - -; RocketHideout2_h map_id=200 -ROCKET_HIDEOUT_2_HEIGHT EQU $0e -ROCKET_HIDEOUT_2_WIDTH EQU $0f - -; RocketHideout3_h map_id=201 -ROCKET_HIDEOUT_3_HEIGHT EQU $0e -ROCKET_HIDEOUT_3_WIDTH EQU $0f - -; RocketHideout4_h map_id=202 -ROCKET_HIDEOUT_4_HEIGHT EQU $0c -ROCKET_HIDEOUT_4_WIDTH EQU $0f - -; RocketHideoutElevator_h map_id=203 -ROCKET_HIDEOUT_ELEVATOR_HEIGHT EQU $04 -ROCKET_HIDEOUT_ELEVATOR_WIDTH EQU $03 - -; SilphCo2_h map_id=207 -SILPH_CO_2F_HEIGHT EQU $09 -SILPH_CO_2F_WIDTH EQU $0f - -; SilphCo3_h map_id=208 -SILPH_CO_3F_HEIGHT EQU $09 -SILPH_CO_3F_WIDTH EQU $0f - -; SilphCo4_h map_id=209 -SILPH_CO_4F_HEIGHT EQU $09 -SILPH_CO_4F_WIDTH EQU $0f - -; SilphCo5_h map_id=210 -SILPH_CO_5F_HEIGHT EQU $09 -SILPH_CO_5F_WIDTH EQU $0f - -; SilphCo6_h map_id=211 -SILPH_CO_6F_HEIGHT EQU $09 -SILPH_CO_6F_WIDTH EQU $0d - -; SilphCo7_h map_id=212 -SILPH_CO_7F_HEIGHT EQU $09 -SILPH_CO_7F_WIDTH EQU $0d - -; SilphCo8_h map_id=213 -SILPH_CO_8F_HEIGHT EQU $09 -SILPH_CO_8F_WIDTH EQU $0d - -; Mansion2_h map_id=214 -MANSION_2_HEIGHT EQU $0e -MANSION_2_WIDTH EQU $0f - -; Mansion3_h map_id=215 -MANSION_3_HEIGHT EQU $09 -MANSION_3_WIDTH EQU $0f - -; Mansion4_h map_id=216 -MANSION_4_HEIGHT EQU $0e -MANSION_4_WIDTH EQU $0f - -; SafariZoneEast_h map_id=217 -SAFARI_ZONE_EAST_HEIGHT EQU $0d -SAFARI_ZONE_EAST_WIDTH EQU $0f - -; SafariZoneNorth_h map_id=218 -SAFARI_ZONE_NORTH_HEIGHT EQU $12 -SAFARI_ZONE_NORTH_WIDTH EQU $14 - -; SafariZoneWest_h map_id=219 -SAFARI_ZONE_WEST_HEIGHT EQU $0d -SAFARI_ZONE_WEST_WIDTH EQU $0f - -; SafariZoneCenter_h map_id=220 -SAFARI_ZONE_CENTER_HEIGHT EQU $0d -SAFARI_ZONE_CENTER_WIDTH EQU $0f - -; SafariZoneRestHouse1_h map_id=221 -SAFARI_ZONE_REST_HOUSE_1_HEIGHT EQU $04 -SAFARI_ZONE_REST_HOUSE_1_WIDTH EQU $04 - -; SafariZoneSecretHouse_h map_id=222 -SAFARI_ZONE_SECRET_HOUSE_HEIGHT EQU $04 -SAFARI_ZONE_SECRET_HOUSE_WIDTH EQU $04 - -; SafariZoneRestHouse2_h map_id=223 -SAFARI_ZONE_REST_HOUSE_2_HEIGHT EQU $04 -SAFARI_ZONE_REST_HOUSE_2_WIDTH EQU $04 - -; SafariZoneRestHouse3_h map_id=224 -SAFARI_ZONE_REST_HOUSE_3_HEIGHT EQU $04 -SAFARI_ZONE_REST_HOUSE_3_WIDTH EQU $04 - -; SafariZoneRestHouse4_h map_id=225 -SAFARI_ZONE_REST_HOUSE_4_HEIGHT EQU $04 -SAFARI_ZONE_REST_HOUSE_4_WIDTH EQU $04 - -; UnknownDungeon2_h map_id=226 -UNKNOWN_DUNGEON_2_HEIGHT EQU $09 -UNKNOWN_DUNGEON_2_WIDTH EQU $0f - -; UnknownDungeon3_h map_id=227 -UNKNOWN_DUNGEON_3_HEIGHT EQU $09 -UNKNOWN_DUNGEON_3_WIDTH EQU $0f - -; UnknownDungeon1_h map_id=228 -UNKNOWN_DUNGEON_1_HEIGHT EQU $09 -UNKNOWN_DUNGEON_1_WIDTH EQU $0f - -; NameRater_h map_id=229 -NAME_RATERS_HOUSE_HEIGHT EQU $04 -NAME_RATERS_HOUSE_WIDTH EQU $04 - -; CeruleanHouse2_h map_id=230 -CERULEAN_HOUSE_2_HEIGHT EQU $04 -CERULEAN_HOUSE_2_WIDTH EQU $04 - -; RockTunnel2_h map_id=232 -ROCK_TUNNEL_2_HEIGHT EQU $12 -ROCK_TUNNEL_2_WIDTH EQU $14 - -; SilphCo9_h map_id=233 -SILPH_CO_9F_HEIGHT EQU $09 -SILPH_CO_9F_WIDTH EQU $0d - -; SilphCo10_h map_id=234 -SILPH_CO_10F_HEIGHT EQU $09 -SILPH_CO_10F_WIDTH EQU $08 - -; SilphCo11_h map_id=235 -SILPH_CO_11F_HEIGHT EQU $09 -SILPH_CO_11F_WIDTH EQU $09 - -; SilphCoElevator_h map_id=236 -SILPH_CO_ELEVATOR_HEIGHT EQU $02 -SILPH_CO_ELEVATOR_WIDTH EQU $02 - -; TradeCenter_h map_id=239 -TRADE_CENTER_HEIGHT EQU $04 -TRADE_CENTER_WIDTH EQU $05 - -; Colosseum_h map_id=240 -COLOSSEUM_HEIGHT EQU $04 -COLOSSEUM_WIDTH EQU $05 - -; Lorelei_h map_id=245 -LORELEIS_ROOM_HEIGHT EQU $06 -LORELEIS_ROOM_WIDTH EQU $05 - -; Bruno_h map_id=246 -BRUNOS_ROOM_HEIGHT EQU $06 -BRUNOS_ROOM_WIDTH EQU $05 - -; Agatha_h map_id=247 -AGATHAS_ROOM_HEIGHT EQU $06 -AGATHAS_ROOM_WIDTH EQU $05 - -IF DEF(_OPTION_BEACH_HOUSE) -BEACH_HOUSE_HEIGHT EQU 4 -BEACH_HOUSE_WIDTH EQU 7 -ENDC diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 8c429695..248a8e83 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -3,15 +3,15 @@ CeruleanCityObject: ; 0x18786 (size=170) db $a ; warps db $b, $1b, $0, TRASHED_HOUSE - db $f, $d, $0, CERULEAN_HOUSE + db $f, $d, $0, CERULEAN_HOUSE_1 db $11, $13, $0, CERULEAN_POKECENTER db $13, $1e, $0, CERULEAN_GYM db $19, $d, $0, BIKE_SHOP db $19, $19, $0, CERULEAN_MART db $b, $4, $0, UNKNOWN_DUNGEON_1 db $9, $1b, $2, TRASHED_HOUSE - db $b, $9, $1, CERULEAN_HOUSE_3 - db $9, $9, $0, CERULEAN_HOUSE_3 + db $b, $9, $1, CERULEAN_HOUSE_2 + db $9, $9, $0, CERULEAN_HOUSE_2 db $6 ; signs db $13, $17, $c ; CeruleanCityText12 @@ -36,12 +36,12 @@ CeruleanCityObject: ; 0x18786 (size=170) ; warp-to EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE - EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE + EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE_1 EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1 EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_3 - EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_3 + EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_2 + EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_2 diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index ee611ee5..ee2828ca 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -94,7 +94,7 @@ InternalMapEntries: ; 71382 (1c:5382) IMAP SAFARI_ZONE_REST_HOUSE_4, $8,$C,SafariZoneName IMAP UNKNOWN_DUNGEON_1, $9,$1,CeruleanCaveName IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName - IMAP CERULEAN_HOUSE_3, $A,$2,CeruleanCityName + IMAP CERULEAN_HOUSE_2, $A,$2,CeruleanCityName IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName diff --git a/macros.asm b/macros.asm index 13ec9634..e85cd61f 100644 --- a/macros.asm +++ b/macros.asm @@ -263,10 +263,13 @@ tx_pre_jump: MACRO jp PrintPredefTextID ENDM -sound0x0A: macro +TX_SFX_KEY_ITEM: macro db $11 endm +TX_CONGRATSSFX: macro + db $10 +endm WALK EQU $FE STAY EQU $FF diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 806fbcab..89abaefb 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -69,7 +69,7 @@ DaisyOfferMapText: ; 19baf (6:5baf) GotMapText: ; 19bb4 (6:5bb4) TX_FAR _GotMapText - sound0x0A + TX_SFX_KEY_ITEM db "@" DaisyBagFullText: ; 19bba (6:5bba) diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index e308b7b5..f4cd32d8 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -944,7 +944,8 @@ OaksLabMonEnergeticText: ; 1d222 (7:5222) OaksLabReceivedMonText: ; 1d227 (7:5227) TX_FAR _OaksLabReceivedMonText - db $11, "@" + TX_SFX_KEY_ITEM + db "@" OaksLabScript_1d22d: ; 1d22d (7:522d) ld a, $5 @@ -1047,7 +1048,7 @@ OaksLabText_1d2fa: ; 1d2fa (7:52fa) OaksLabDeliverParcelText: ; 1d2ff (7:52ff) TX_FAR _OaksLabDeliverParcelText1 - db $11 + TX_SFX_KEY_ITEM TX_FAR _OaksLabDeliverParcelText2 db "@" @@ -1057,7 +1058,7 @@ OaksLabAroundWorldText: ; 1d309 (7:5309) OaksLabGivePokeballsText: ; 1d30e (7:530e) TX_FAR _OaksLabGivePokeballsText1 - db $11 + TX_SFX_KEY_ITEM TX_FAR _OaksLabGivePokeballsText2 db "@" @@ -1166,7 +1167,8 @@ OaksLabText14: ; 1d39f (7:539f) OaksLabRivalReceivedMonText: ; 1d3a9 (7:53a9) TX_FAR _OaksLabRivalReceivedMonText - db $11, "@" + TX_SFX_KEY_ITEM + db "@" OaksLabText15: ; 1d3af (7:53af) TX_ASM @@ -1214,7 +1216,8 @@ OaksLabText24: ; 1d3e6 (7:53e6) OaksLabText25: ; 1d3eb (7:53eb) TX_FAR _OaksLabText25 - db $11, "@" + TX_SFX_KEY_ITEM + db "@" OaksLabText26: ; 1d3f1 (7:53f1) TX_FAR _OaksLabText26 -- cgit v1.3.1-sl0p From 674b4dcc4aabde8b5556c0ed32383c32b11a4f0e Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Tue, 7 Jun 2016 23:55:55 -0600 Subject: Remove the Beach House option. --- constants/map_constants.asm | 3 - constants/map_dimensions.asm | 5 - constants/tilesets.asm | 3 - data/collision.asm | 3 - data/mapHeaders/beach_house.asm | 7 -- data/mapObjects/beach_house.asm | 20 ---- data/mapObjects/route19.asm | 23 +---- data/map_header_banks.asm | 3 - data/map_header_pointers.asm | 3 - data/map_songs.asm | 3 - data/tileset_headers.asm | 3 - data/wild_mons.asm | 3 - gfx/blocksets/beachhouse.bst | Bin 320 -> 0 bytes gfx/tilesets/beachhouse.png | Bin 566 -> 0 bytes gfx/tilesets/beachhouse.tilecoll | 1 - main.asm | 20 ---- maps/beach_house.blk | 1 - scripts/beach_house.asm | 195 --------------------------------------- text.asm | 3 - text/maps/beach_house.asm | 103 --------------------- 20 files changed, 1 insertion(+), 401 deletions(-) delete mode 100644 data/mapHeaders/beach_house.asm delete mode 100644 data/mapObjects/beach_house.asm delete mode 100644 gfx/blocksets/beachhouse.bst delete mode 100644 gfx/tilesets/beachhouse.png delete mode 100644 gfx/tilesets/beachhouse.tilecoll delete mode 100644 maps/beach_house.blk delete mode 100644 scripts/beach_house.asm delete mode 100644 text/maps/beach_house.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 3bd79f3c..551c59ad 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -248,6 +248,3 @@ const_value = 0 const LORELEIS_ROOM ; $F5 const BRUNOS_ROOM ; $F6 const AGATHAS_ROOM ; $F7 -IF DEF(_OPTION_BEACH_HOUSE) - const BEACH_HOUSE ; $F8 -ENDC diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm index ad6caa23..cc6fed9f 100755 --- a/constants/map_dimensions.asm +++ b/constants/map_dimensions.asm @@ -891,8 +891,3 @@ BRUNOS_ROOM_WIDTH EQU $05 ; Agatha_h map_id=247 AGATHAS_ROOM_HEIGHT EQU $06 AGATHAS_ROOM_WIDTH EQU $05 - -IF DEF(_OPTION_BEACH_HOUSE) -BEACH_HOUSE_HEIGHT EQU 4 -BEACH_HOUSE_WIDTH EQU 7 -ENDC diff --git a/constants/tilesets.asm b/constants/tilesets.asm index 86f87433..f10e4d92 100644 --- a/constants/tilesets.asm +++ b/constants/tilesets.asm @@ -24,6 +24,3 @@ const_value = 0 const CLUB ; 21 const FACILITY ; 22 const PLATEAU ; 23 -IF DEF(_OPTION_BEACH_HOUSE) - const BEACH_HOUSE_TILESET ; 24 -ENDC diff --git a/data/collision.asm b/data/collision.asm index 46d5ddc6..78579242 100644 --- a/data/collision.asm +++ b/data/collision.asm @@ -22,6 +22,3 @@ Lab_Coll:: INCBIN "gfx/tilesets/lab.tilecoll" Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll" Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll" Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll" -IF DEF(_OPTION_BEACH_HOUSE) -BeachHouse_Coll:: INCBIN "gfx/tilesets/beachhouse.tilecoll" -ENDC diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm deleted file mode 100644 index 99d237f6..00000000 --- a/data/mapHeaders/beach_house.asm +++ /dev/null @@ -1,7 +0,0 @@ -BeachHouse_h: - - db BEACH_HOUSE_TILESET - db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x) - dw BeachHouseBlockdata,BeachHouseTextPointers,BeachHouseScript ; blocks, texts, scripts - db 0 ; connections - dw BeachHouseObjects ; objects diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm deleted file mode 100644 index 847883d1..00000000 --- a/data/mapObjects/beach_house.asm +++ /dev/null @@ -1,20 +0,0 @@ -BeachHouseObjects: ; 0xf23a4 - db $a ; border block - - db 2 ; warps - db 7,2,0,$ff - db 7,3,0,$ff - - db 4 ; signs - db 0,3,3 - db 0,7,4 - db 0,$b,5 - db 1,$d,6 - - db 2 ; objects - object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude - object $3d, 5, 3, WALK, $01, 2 ; pikachu - - ; warp-to - EVENT_DISP BEACH_HOUSE_WIDTH,7,2 - EVENT_DISP BEACH_HOUSE_WIDTH,7,3 diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index ee55a069..1b99d90e 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,42 +1,21 @@ Route19Object: ; 0x54e9a (size=87) db $43 ; border block - IF DEF(_OPTION_BEACH_HOUSE) - db $1 ; warps - db $9, $5, $0, BEACH_HOUSE - ELSE - db $0 ; warps - ENDC + db $0 ; warps db $1 ; signs -IF DEF(_OPTION_BEACH_HOUSE) - db $b,$b,$b -ELSE db $9, $b, $b ; Route19Text11 -ENDC db $a ; objects -IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3 -ELSE object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2 object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, OPP_SWIMMER, 3 -ENDC object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 -IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7 -ELSE object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, OPP_SWIMMER, $7 -ENDC object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8 object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e ; warp-to - IF DEF(_OPTION_BEACH_HOUSE) - EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE - ENDC diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index ed120d75..8796a608 100755 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -248,6 +248,3 @@ MapHeaderBanks: ; c23d (3:423d) db BANK(Lorelei_h) db BANK(Bruno_h) db BANK(Agatha_h) -IF DEF(_OPTION_BEACH_HOUSE) - db BANK(BeachHouse_h) -ENDC diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index ef2b4e65..746d3211 100755 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -248,6 +248,3 @@ MapHeaderPointers:: ; 01ae (0:01ae) dw Lorelei_h dw Bruno_h dw Agatha_h ;247 -IF DEF(_OPTION_BEACH_HOUSE) - dw BeachHouse_h -ENDC diff --git a/data/map_songs.asm b/data/map_songs.asm index a8022da2..8fee18d2 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -247,6 +247,3 @@ MapSongBanks: ; c04d (3:404d) db MUSIC_GYM, BANK(Music_Gym) ; Lorelei db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha -IF DEF(_OPTION_BEACH_HOUSE) - db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse -ENDC diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 3e2e68bb..84cfaffd 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -23,6 +23,3 @@ Tilesets: ; c7be (3:47be) tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE -IF DEF(_OPTION_BEACH_HOUSE) - tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR -ENDC diff --git a/data/wild_mons.asm b/data/wild_mons.asm index f29fd340..482405e3 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -247,9 +247,6 @@ WildDataPointers: ; ceeb (3:4eeb) dw NoMons dw NoMons dw NoMons - IF DEF(_OPTION_BEACH_HOUSE) - dw NoMons - ENDC dw $FFFF ; wild pokemon data is divided into two parts. diff --git a/gfx/blocksets/beachhouse.bst b/gfx/blocksets/beachhouse.bst deleted file mode 100644 index bafbe0b2..00000000 Binary files a/gfx/blocksets/beachhouse.bst and /dev/null differ diff --git a/gfx/tilesets/beachhouse.png b/gfx/tilesets/beachhouse.png deleted file mode 100644 index f5dccf7a..00000000 Binary files a/gfx/tilesets/beachhouse.png and /dev/null differ diff --git a/gfx/tilesets/beachhouse.tilecoll b/gfx/tilesets/beachhouse.tilecoll deleted file mode 100644 index 54ddac19..00000000 --- a/gfx/tilesets/beachhouse.tilecoll +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/main.asm b/main.asm index 8049b646..7f824b74 100755 --- a/main.asm +++ b/main.asm @@ -5120,12 +5120,6 @@ INCLUDE "data/mapHeaders/billshouse.asm" INCLUDE "scripts/billshouse.asm" INCLUDE "data/mapObjects/billshouse.asm" BillsHouseBlocks: INCBIN "maps/billshouse.blk" -IF DEF(_OPTION_BEACH_HOUSE) -INCLUDE "data/mapHeaders/beach_house.asm" -INCLUDE "scripts/beach_house.asm" -BeachHouseBlockdata: INCBIN "maps/beach_house.blk" -INCLUDE "data/mapObjects/beach_house.asm" -ENDC INCLUDE "engine/menu/oaks_pc.asm" @@ -6042,11 +6036,7 @@ Route17Blocks: INCBIN "maps/route17.blk" INCLUDE "data/mapHeaders/route19.asm" INCLUDE "data/mapObjects/route19.asm" -IF DEF(_OPTION_BEACH_HOUSE) -Route19Blocks: INCBIN "maps/route19-yellow.blk" -ELSE Route19Blocks: INCBIN "maps/route19.blk" -ENDC INCLUDE "data/mapHeaders/route21.asm" INCLUDE "data/mapObjects/route21.asm" @@ -6714,13 +6704,3 @@ INCLUDE "engine/evolution.asm" INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/items/tm_prices.asm" - -IF DEF(_OPTION_BEACH_HOUSE) -SECTION "bank3C",ROMX[$4314],BANK[$3C] - -BeachHouse_GFX: - INCBIN "gfx/tilesets/beachhouse.2bpp" - -BeachHouse_Block: - INCBIN "gfx/blocksets/beachhouse.bst" -ENDC diff --git a/maps/beach_house.blk b/maps/beach_house.blk deleted file mode 100644 index 5bcdb58a..00000000 --- a/maps/beach_house.blk +++ /dev/null @@ -1 +0,0 @@ -      \ No newline at end of file diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm deleted file mode 100644 index d6112df7..00000000 --- a/scripts/beach_house.asm +++ /dev/null @@ -1,195 +0,0 @@ -BeachHouseScript: - call $3c29 - ret - -BeachHouseTextPointers: - dw SurfinDudeText - dw BeachHousePikachuText - dw BeachHouseSign1Text - dw BeachHouseSign2Text - dw BeachHouseSign3Text - dw BeachHouseSign4Text - -SurfinDudeText: - TX_ASM - ld a,[$d471] - bit 6,a - jr nz,.next - ld hl,.SurfinDudeText4 - call PrintText - jr .done -.next - ld hl,$d492 - bit 0,[hl] - set 0,[hl] - jr nz,.next2 - ld hl,.SurfinDudeText1 - jr .next3 -.next2 - ld hl,.SurfinDudeText3 -.next3 - call PrintText - call YesNoChoice - ld a,[wCurrentMenuItem] - and a - jr nz,.xf226b - ld a,1 - ld [$cc3c],a - ld b,$3e - ld hl,$4000 - call $3e84 - ld hl,$d492 - set 1,[hl] - jr .done -.xf226b - ld hl,.SurfinDudeText2 - call PrintText -.done - jp TextScriptEnd - -.SurfinDudeText1 - TX_FAR _SurfinDudeText1 - db "@" -.SurfinDudeText2 - TX_FAR _SurfinDudeText2 - db "@" -.SurfinDudeText3 - TX_FAR _SurfinDudeText3 - db "@" -.SurfinDudeText4 - TX_FAR _SurfinDudeText4 - db "@" - -BeachHousePikachuText: - TX_ASM - ld hl,.BeachHousePikachuText - call PrintText - ld a,PIKACHU - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -.BeachHousePikachuText - TX_FAR _BeachHousePikachuText - db "@" - -BeachHouseSign1Text: - TX_ASM - ld hl,.BeachHouseSign1Text2 - ld a,[$d471] - bit 6,a - jr z,.next - ld hl,.BeachHouseSign1Text1 -.next - call PrintText - jp TextScriptEnd - -.BeachHouseSign1Text1 - TX_FAR _BeachHouseSign1Text1 - db "@" -.BeachHouseSign1Text2 - TX_FAR _BeachHouseSign1Text2 - db "@" - -BeachHouseSign2Text: - TX_ASM - ld hl,.BeachHouseSign2Text2 - ld a,[$d471] - bit 6,a - jr z,.next - ld hl,.BeachHouseSign2Text1 -.next - call PrintText - jp TextScriptEnd - -.BeachHouseSign2Text1 - TX_FAR _BeachHouseSign2Text1 - db "@" -.BeachHouseSign2Text2 - TX_FAR _BeachHouseSign2Text2 - db "@" - -BeachHouseSign3Text: - TX_ASM - ld hl,.BeachHouseSign3Text2 - ld a,[$d471] - bit 6,a - jr z,.next - ld hl,.BeachHouseSign3Text1 -.next - call PrintText - jp TextScriptEnd - -.BeachHouseSign3Text1 - TX_FAR _BeachHouseSign3Text1 - db "@" -.BeachHouseSign3Text2 - TX_FAR _BeachHouseSign3Text2 - db "@" - -BeachHouseSign4Text: - TX_ASM - ld a,1 - ld [$cc3c],a - ld a,[$d471] - bit 6,a - jr z,.xf2369 - - ld hl,$d492 - bit 1,[hl] - jr z,.next2 - ld a,0 - ld [$cc3c],a -.next2 - ld hl,.BeachHousePrinterText2 - call PrintText - ld a,[$d492] - bit 1,a - jr z,.xf236f - - ld a,1 - ld [$cc3c],a - ld hl,.BeachHousePrinterText3 - call PrintText - call YesNoChoice - ld a,[wCurrentMenuItem] - and a - jp z,$63d0 ; 0xf23d0 - call $36ec - ld hl,$d72f - set 6,[hl] - xor a - ld [$cfca],a - ld hl,$510a - ld b,$3a - call $3e84 - call $3852 - ld hl,$d72f - res 6,[hl] - call $3dd8 - call $2f83 - call $3dc2 - call $36f8 - call $3ddb - call $3de0 - ld a,1 - ld [$cfca],a - jr .xf236f -.xf2369 - ld hl,.BeachHousePrinterText1 - call PrintText -.xf236f - jp TextScriptEnd - -.BeachHousePrinterText1 - TX_FAR _BeachHousePrinterText1 - db $d,"@" -.BeachHousePrinterText2 - TX_FAR _BeachHousePrinterText2 - db $d,"@" -.BeachHousePrinterText3 - TX_FAR _BeachHousePrinterText3 - db "@" -.xf2383 - TX_FAR _BeachHousePrinterText4 - db "@" diff --git a/text.asm b/text.asm index 9a5ecff7..17959ce2 100644 --- a/text.asm +++ b/text.asm @@ -1969,9 +1969,6 @@ INCLUDE "text/maps/route_16_gate_upstairs.asm" INCLUDE "text/maps/route_16_house.asm" INCLUDE "text/maps/route_18_gate.asm" INCLUDE "text/maps/route_18_gate_upstairs.asm" -IF DEF(_OPTION_BEACH_HOUSE) -INCLUDE "text/maps/beach_house.asm" -ENDC INCLUDE "text/maps/pokemon_league_gate.asm" INCLUDE "text/maps/victory_road_2f.asm" INCLUDE "text/maps/bills_house.asm" diff --git a/text/maps/beach_house.asm b/text/maps/beach_house.asm deleted file mode 100644 index 318b6013..00000000 --- a/text/maps/beach_house.asm +++ /dev/null @@ -1,103 +0,0 @@ -_SurfinDudeText1:: - text "Whoa!" - - para "Your PIKACHU knows" - line "how to SURF! So," - cont "I'm not alone..." - - para "Great! You earned" - line "the right to SURF" - cont "with the DUDE!" - - para "Give it a go?" - done - -_SurfinDudeText2:: - text "Come SURF anytime," - line "my friend!" - done - -_SurfinDudeText3:: - text "Wanna go SURF?" - done - -_SurfinDudeText4:: - text "Dogs and burgers" - line "on special today!" - done - -_BeachHousePikachuText:: - text "PIKACHU: Pikaa." - done - -_BeachHouseSign1Text1:: - text "SURFIN' DUDE's" - line "scribbles..." - - para "When I shoot the" - line "tube, the tunes" - cont "hit the groove!" - done - -_BeachHouseSign1Text2:: - text "30 years of waves!" - line "SURFIN' DUDE" - done - -_BeachHouseSign2Text1:: - text "SURFING TIP 1!" - - para "After flips, line" - line "the board up with" - cont "a wave for a cool" - cont "effect!" - done - -_BeachHouseSign2Text2:: - text "SUMMER BEACH HOUSE" - line "#MON welcome!" - done - -_BeachHouseSign3Text1:: - text "SURFING TIP 2!" - - para "Pulling flips in" - line "a jump is totally" - cont "rad!" - done - -_BeachHouseSign3Text2:: - text "The sea unites" - line "all in surfdom!" - done - -_BeachHousePrinterText1:: - text "It's some sort of" - line "a machine...@@" - -_BeachHousePrinterText2:: - text "SUMMER BEACH HOUSE" - line "PRINTER, it says.@@" - -_BeachHousePrinterText3:: - text "The Hi.Score is" - line "shown." - - para "PRINT it out?" - done - -_BeachHousePrinterText4:: - text "SUMMER BEACH HOUSE" - line "PRINTER, it says." - - para "The Hi.Score is" - line "shown." - - para "PRINT it out?" - done - -_BeachHousePrinterText5:: - text "PRINT completed.@@" - -_BeachHousePrinterText6:: - text "PRINT error!@@" -- cgit v1.3.1-sl0p From 3425fd6ef8f620d3366dcf9462b89c4b7f7e1b37 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 8 Jun 2016 05:45:50 -0600 Subject: Sync somewhat with pokeyellow. --- scripts/bikeshop.asm | 36 ++++++++--------- text.asm | 8 ---- text/maps/agatha.asm | 1 - text/maps/bike_shop.asm | 1 - text/maps/bills_house.asm | 1 - text/maps/blues_house.asm | 1 - text/maps/bruno.asm | 1 - text/maps/celadon_city.asm | 1 - text/maps/celadon_diner.asm | 1 - text/maps/celadon_game_corner.asm | 1 - text/maps/celadon_gym.asm | 1 - text/maps/celadon_hotel.asm | 1 - text/maps/celadon_house.asm | 1 - text/maps/celadon_mansion_1f.asm | 1 - text/maps/celadon_mansion_2f.asm | 1 - text/maps/celadon_mansion_3f.asm | 1 - text/maps/celadon_mansion_4f_inside.asm | 1 - text/maps/celadon_mansion_4f_outside.asm | 1 - text/maps/celadon_prize_room.asm | 1 - text/maps/cerulean_badge_house.asm | 1 - text/maps/cerulean_city.asm | 1 - text/maps/cerulean_gym.asm | 1 - text/maps/cerulean_trashed_house.asm | 1 - text/maps/champion.asm | 1 - text/maps/cinnabar_gym.asm | 1 - text/maps/cinnabar_island.asm | 1 - text/maps/cinnabar_lab.asm | 1 - text/maps/cinnabar_lab_fossil_room.asm | 1 - text/maps/cinnabar_lab_metronome_room.asm | 1 - text/maps/cinnabar_lab_trade_room.asm | 1 - text/maps/copycats_house_2f.asm | 1 - text/maps/daycare_1.asm | 1 - text/maps/daycare_2.asm | 1 - text/maps/digletts_cave_route_11_entrance.asm | 1 - text/maps/digletts_cave_route_2_entrance.asm | 1 - text/maps/fan_club.asm | 1 - text/maps/fighting_dojo.asm | 1 - text/maps/fuchsia_city.asm | 1 - text/maps/fuchsia_fishing_house.asm | 1 - text/maps/fuchsia_gym_1.asm | 1 - text/maps/fuchsia_gym_2.asm | 1 - text/maps/fuchsia_house.asm | 1 - text/maps/fuchsia_meeting_room.asm | 1 - text/maps/fujis_house.asm | 1 - text/maps/hall_of_fame.asm | 1 - text/maps/lance.asm | 1 - text/maps/lavender_house.asm | 1 - text/maps/lavender_town.asm | 1 - text/maps/lorelei.asm | 1 - text/maps/mansion_1f.asm | 1 - text/maps/mansion_2f.asm | 1 - text/maps/mansion_3f.asm | 1 - text/maps/mansion_b1f.asm | 1 - text/maps/mr_psychics_house.asm | 1 - text/maps/mt_moon_b1f.asm | 1 - text/maps/museum_1f.asm | 1 - text/maps/name_rater.asm | 1 - text/maps/oaks_lab.asm | 1 - text/maps/pallet_town.asm | 1 - text/maps/pewter_city.asm | 1 - text/maps/pewter_gym_1.asm | 1 - text/maps/pewter_house_1.asm | 1 - text/maps/pewter_house_2.asm | 1 - text/maps/pokemon_league_gate.asm | 1 - text/maps/pokemon_tower_1f.asm | 1 - text/maps/pokemon_tower_2f.asm | 1 - text/maps/pokemon_tower_3f.asm | 1 - text/maps/pokemon_tower_4f.asm | 1 - text/maps/pokemon_tower_5f.asm | 1 - text/maps/pokemon_tower_6f.asm | 1 - text/maps/power_plant.asm | 1 - text/maps/reds_house_1f.asm | 1 - text/maps/rock_tunnel_b1f.asm | 1 - text/maps/rock_tunnel_b2f_1.asm | 1 - text/maps/rock_tunnel_b2f_2.asm | 1 - text/maps/rocket_hideout_b1f.asm | 1 - text/maps/rocket_hideout_b2f.asm | 1 - text/maps/rocket_hideout_b3f.asm | 1 - text/maps/rocket_hideout_b4f.asm | 1 - text/maps/rocket_hideout_elevator.asm | 1 - text/maps/route_1.asm | 1 - text/maps/route_10.asm | 1 - text/maps/route_11_1.asm | 2 - text/maps/route_11_2.asm | 1 - text/maps/route_11_gate.asm | 1 - text/maps/route_11_gate_upstairs.asm | 1 - text/maps/route_12.asm | 1 - text/maps/route_12_gate.asm | 1 - text/maps/route_12_gate_upstairs.asm | 1 - text/maps/route_12_house.asm | 1 - text/maps/route_13.asm | 1 - text/maps/route_14.asm | 1 - text/maps/route_15.asm | 1 - text/maps/route_15_gate.asm | 1 - text/maps/route_15_gate_upstairs.asm | 1 - text/maps/route_16.asm | 1 - text/maps/route_16_gate.asm | 1 - text/maps/route_16_gate_upstairs.asm | 1 - text/maps/route_16_house.asm | 1 - text/maps/route_17.asm | 1 - text/maps/route_18.asm | 1 - text/maps/route_18_gate.asm | 1 - text/maps/route_18_gate_upstairs.asm | 2 - text/maps/route_19.asm | 1 - text/maps/route_2.asm | 1 - text/maps/route_20.asm | 1 - text/maps/route_21.asm | 1 - text/maps/route_22.asm | 1 - text/maps/route_23.asm | 1 - text/maps/route_24_1.asm | 1 - text/maps/route_24_2.asm | 1 - text/maps/route_25.asm | 1 - text/maps/route_2_gate.asm | 1 - text/maps/route_2_house.asm | 1 - text/maps/route_3.asm | 1 - text/maps/route_4.asm | 1 - text/maps/route_5.asm | 1 - text/maps/route_6.asm | 1 - text/maps/route_7.asm | 1 - text/maps/route_8.asm | 1 - text/maps/route_9.asm | 1 - text/maps/safari_zone_center.asm | 1 - text/maps/safari_zone_east.asm | 1 - text/maps/safari_zone_entrance.asm | 47 ---------------------- text/maps/safari_zone_north.asm | 1 - text/maps/safari_zone_rest_house_1.asm | 1 - text/maps/safari_zone_rest_house_2.asm | 1 - text/maps/safari_zone_rest_house_3.asm | 1 - text/maps/safari_zone_rest_house_4.asm | 1 - text/maps/safari_zone_secret_house.asm | 1 - text/maps/safari_zone_west.asm | 1 - text/maps/saffron_city.asm | 1 - text/maps/saffron_gates.asm | 1 - text/maps/saffron_gym.asm | 1 - text/maps/saffron_house.asm | 1 - text/maps/seafoam_islands_1f.asm | 2 - text/maps/seafoam_islands_b1f.asm | 2 - text/maps/seafoam_islands_b2f.asm | 2 - text/maps/seafoam_islands_b3f.asm | 2 - text/maps/seafoam_islands_b4f.asm | 1 - text/maps/silph_co_11f.asm | 1 - text/maps/silph_co_1f.asm | 1 - text/maps/silph_co_2f.asm | 1 - text/maps/silph_co_3f.asm | 1 - text/maps/silph_co_4f.asm | 1 - text/maps/silph_co_5f_2.asm | 1 - text/maps/silph_co_6f.asm | 1 - text/maps/silph_co_7f.asm | 1 - text/maps/silph_co_8f.asm | 1 - text/maps/silph_co_9f.asm | 1 - text/maps/ss_anne_1.asm | 1 - text/maps/ss_anne_10.asm | 1 - text/maps/ss_anne_2.asm | 1 - text/maps/ss_anne_3.asm | 1 - text/maps/ss_anne_4.asm | 2 - text/maps/ss_anne_5.asm | 1 - text/maps/ss_anne_6.asm | 1 - text/maps/ss_anne_7.asm | 1 - text/maps/ss_anne_8.asm | 1 - text/maps/ss_anne_9.asm | 1 - text/maps/underground_path_route_5_entrance.asm | 2 - text/maps/underground_path_route_6_entrance.asm | 1 - text/maps/underground_path_route_7_entrance.asm | 1 - .../underground_path_route_7_entrance_unused.asm | 1 - text/maps/underground_path_route_8_entrance.asm | 1 - text/maps/unknown_dungeon_1f.asm | 2 - text/maps/unknown_dungeon_2f.asm | 2 - text/maps/unknown_dungeon_b1f.asm | 1 - text/maps/vermilion_city.asm | 1 - text/maps/vermilion_dock.asm | 1 - text/maps/vermilion_fishing_house.asm | 1 - text/maps/vermilion_gym_2.asm | 1 - text/maps/vermilion_house.asm | 1 - text/maps/victory_road_1f.asm | 1 - text/maps/victory_road_2f.asm | 1 - text/maps/victory_road_3f.asm | 1 - text/maps/viridian_city.asm | 1 - text/maps/viridian_forest.asm | 1 - text/maps/viridian_forest_exit.asm | 1 - text/maps/viridian_gym.asm | 1 - text/maps/viridian_house.asm | 1 - text/maps/wardens_house.asm | 1 - 182 files changed, 18 insertions(+), 262 deletions(-) delete mode 100644 text/maps/seafoam_islands_1f.asm delete mode 100644 text/maps/seafoam_islands_b1f.asm delete mode 100644 text/maps/seafoam_islands_b2f.asm delete mode 100644 text/maps/seafoam_islands_b3f.asm delete mode 100644 text/maps/ss_anne_4.asm delete mode 100644 text/maps/underground_path_route_5_entrance.asm delete mode 100644 text/maps/unknown_dungeon_1f.asm delete mode 100644 text/maps/unknown_dungeon_2f.asm diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index e639caf9..866c04b0 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -1,12 +1,12 @@ -BikeShopScript: ; 1d73c (7:573c) +BikeShopScript: jp EnableAutoTextBoxDrawing -BikeShopTextPointers: ; 1d73f (7:573f) +BikeShopTextPointers: dw BikeShopText1 dw BikeShopText2 dw BikeShopText3 -BikeShopText1: ; 1d745 (7:5745) +BikeShopText1: TX_ASM CheckEvent EVENT_GOT_BICYCLE jr z, .asm_260d4 @@ -78,56 +78,56 @@ BikeShopText1: ; 1d745 (7:5745) .Done jp TextScriptEnd -BikeShopMenuText: ; 1d7f8 (7:57f8) +BikeShopMenuText: db "BICYCLE" next "CANCEL@" -BikeShopMenuPrice: ; 1d807 (7:5807) +BikeShopMenuPrice: db "¥1000000@" -BikeShopText_1d810: ; 1d810 (7:5810) +BikeShopText_1d810: TX_FAR _BikeShopText_1d810 db "@" -BikeShopText_1d815: ; 1d815 (7:5815) +BikeShopText_1d815: TX_FAR _BikeShopText_1d815 db "@" -BikeShopCantAffordText: ; 1d81a (7:581a) +BikeShopCantAffordText: TX_FAR _BikeShopCantAffordText db "@" -BikeShopText_1d81f: ; 1d81f (7:581f) +BikeShopText_1d81f: TX_FAR _BikeShopText_1d81f db "@" -BikeShopText_1d824: ; 1d824 (7:5824) +BikeShopText_1d824: TX_FAR _BikeShopText_1d824 db $11, "@" -BikeShopComeAgainText: ; 1d82a (7:582a) +BikeShopComeAgainText: TX_FAR _BikeShopComeAgainText db "@" -BikeShopText_1d82f: ; 1d82f (7:582f) +BikeShopText_1d82f: TX_FAR _BikeShopText_1d82f db "@" -BikeShopText_1d834: ; 1d834 (7:5834) +BikeShopText_1d834: TX_FAR _BikeShopText_1d834 db "@" -BikeShopText2: ; 1d839 (7:5839) +BikeShopText2: TX_ASM ld hl, BikeShopText_1d843 call PrintText jp TextScriptEnd -BikeShopText_1d843: ; 1d843 (7:5843) +BikeShopText_1d843: TX_FAR _BikeShopText_1d843 db "@" -BikeShopText3: ; 1d848 (7:5848) +BikeShopText3: TX_ASM CheckEvent EVENT_GOT_BICYCLE ld hl, BikeShopText_1d861 @@ -137,10 +137,10 @@ BikeShopText3: ; 1d848 (7:5848) call PrintText jp TextScriptEnd -BikeShopText_1d85c: ; 1d85c (7:585c) +BikeShopText_1d85c: TX_FAR _BikeShopText_1d85c db "@" -BikeShopText_1d861: ; 1d861 (7:5861) +BikeShopText_1d861: TX_FAR _BikeShopText_1d861 db "@" diff --git a/text.asm b/text.asm index 17959ce2..6e31fb03 100644 --- a/text.asm +++ b/text.asm @@ -174,7 +174,6 @@ INCLUDE "text/maps/mt_moon_b2f.asm" INCLUDE "text/maps/ss_anne_1.asm" INCLUDE "text/maps/ss_anne_2.asm" INCLUDE "text/maps/ss_anne_3.asm" -INCLUDE "text/maps/ss_anne_4.asm" INCLUDE "text/maps/ss_anne_5.asm" INCLUDE "text/maps/ss_anne_6.asm" INCLUDE "text/maps/ss_anne_7.asm" @@ -214,8 +213,6 @@ INCLUDE "text/maps/safari_zone_secret_house.asm" INCLUDE "text/maps/safari_zone_rest_house_2.asm" INCLUDE "text/maps/safari_zone_rest_house_3.asm" INCLUDE "text/maps/safari_zone_rest_house_4.asm" -INCLUDE "text/maps/unknown_dungeon_1f.asm" -INCLUDE "text/maps/unknown_dungeon_2f.asm" INCLUDE "text/maps/unknown_dungeon_b1f.asm" INCLUDE "text/maps/victory_road_1f.asm" INCLUDE "text/maps/lance.asm" @@ -230,10 +227,6 @@ INCLUDE "text/maps/rock_tunnel_b2f_1.asm" SECTION "Text 3", ROMX, BANK[TEXT_3] INCLUDE "text/maps/rock_tunnel_b2f_2.asm" -INCLUDE "text/maps/seafoam_islands_1f.asm" -INCLUDE "text/maps/seafoam_islands_b1f.asm" -INCLUDE "text/maps/seafoam_islands_b2f.asm" -INCLUDE "text/maps/seafoam_islands_b3f.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" _AIBattleWithdrawText:: @@ -1948,7 +1941,6 @@ INCLUDE "text/maps/daycare_1.asm" SECTION "Text 4", ROMX, BANK[TEXT_4] INCLUDE "text/maps/daycare_2.asm" -INCLUDE "text/maps/underground_path_route_5_entrance.asm" INCLUDE "text/maps/underground_path_route_6_entrance.asm" INCLUDE "text/maps/underground_path_route_7_entrance.asm" INCLUDE "text/maps/underground_path_route_7_entrance_unused.asm" diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 158dbb63..4957f4d4 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -42,4 +42,3 @@ _AgathaDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done - diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 3247e0e3..33f53ee9 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -68,4 +68,3 @@ _BikeShopText_1d861:: text "Wow. Your BIKE is" line "really cool!" done - diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 83f92a64..463b13e6 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -85,4 +85,3 @@ _BillsHouseText_1e8da:: cont "some of my rare" cont "#MON on my PC!" done - diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index 147b23fb..b676ea69 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -39,4 +39,3 @@ _BluesHouseText3:: text "It's a big map!" line "This is useful!" done - diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm index ddcbdb59..39898eb5 100644 --- a/text/maps/bruno.asm +++ b/text/maps/bruno.asm @@ -35,4 +35,3 @@ _BrunoDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done - diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index ab78e9d6..e2470ec1 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -150,4 +150,3 @@ _CeladonCityText18:: line "The playground" cont "for grown-ups!" done - diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm index 7f69e67f..fd31eb20 100644 --- a/text/maps/celadon_diner.asm +++ b/text/maps/celadon_diner.asm @@ -57,4 +57,3 @@ _CeladonDinerText_491b7:: line "I was going to" cont "win it back..." done - diff --git a/text/maps/celadon_game_corner.asm b/text/maps/celadon_game_corner.asm index b74b04b3..2d263e80 100644 --- a/text/maps/celadon_game_corner.asm +++ b/text/maps/celadon_game_corner.asm @@ -184,4 +184,3 @@ _CeladonGameCornerText_48f19:: text "Oops! Forgot the" line "COIN CASE!" done - diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm index c076196f..99833ee1 100644 --- a/text/maps/celadon_gym.asm +++ b/text/maps/celadon_gym.asm @@ -216,4 +216,3 @@ _CeladonGymAfterBattleText8:: para "Wait 'til next" line "time!" done - diff --git a/text/maps/celadon_hotel.asm b/text/maps/celadon_hotel.asm index c9e8bd8b..f2eb059e 100644 --- a/text/maps/celadon_hotel.asm +++ b/text/maps/celadon_hotel.asm @@ -19,4 +19,3 @@ _CeladonHotelText3:: text "Why did she bring" line "her brother?" done - diff --git a/text/maps/celadon_house.asm b/text/maps/celadon_house.asm index c0bb9532..19e59bd6 100644 --- a/text/maps/celadon_house.asm +++ b/text/maps/celadon_house.asm @@ -20,4 +20,3 @@ _CeladonHouseText3:: para "There's no secret" line "switch behind it!" done - diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/celadon_mansion_1f.asm index 953c9c4a..fc175cd5 100644 --- a/text/maps/celadon_mansion_1f.asm +++ b/text/maps/celadon_mansion_1f.asm @@ -21,4 +21,3 @@ _CeladonMansion1Text5:: text "CELADON MANSION" line "Manager's Suite" done - diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/celadon_mansion_2f.asm index ecb46da6..b2ecb4fa 100644 --- a/text/maps/celadon_mansion_2f.asm +++ b/text/maps/celadon_mansion_2f.asm @@ -2,4 +2,3 @@ _CeladonMansion2Text1:: text "GAME FREAK" line "Meeting Room" done - diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/celadon_mansion_3f.asm index f761da72..c8858281 100644 --- a/text/maps/celadon_mansion_3f.asm +++ b/text/maps/celadon_mansion_3f.asm @@ -64,4 +64,3 @@ _CeladonMansion3Text8:: text "GAME FREAK" line "Development Room" done - diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/celadon_mansion_4f_inside.asm index 9749774f..dab81a8d 100644 --- a/text/maps/celadon_mansion_4f_inside.asm +++ b/text/maps/celadon_mansion_4f_inside.asm @@ -8,4 +8,3 @@ _CeladonMansion5Text1:: line "your friends and" cont "trade #MON!" done - diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/celadon_mansion_4f_outside.asm index 7053d74a..c8fd7ec8 100644 --- a/text/maps/celadon_mansion_4f_outside.asm +++ b/text/maps/celadon_mansion_4f_outside.asm @@ -1,4 +1,3 @@ _CeladonMansion4Text1:: text "I KNOW EVERYTHING!" done - diff --git a/text/maps/celadon_prize_room.asm b/text/maps/celadon_prize_room.asm index 3f96fdfb..6b2bb537 100644 --- a/text/maps/celadon_prize_room.asm +++ b/text/maps/celadon_prize_room.asm @@ -10,4 +10,3 @@ _CeladonPrizeRoomText2:: text "I had a major" line "haul today!" done - diff --git a/text/maps/cerulean_badge_house.asm b/text/maps/cerulean_badge_house.asm index 12c0e5ae..9d701443 100644 --- a/text/maps/cerulean_badge_house.asm +++ b/text/maps/cerulean_badge_house.asm @@ -95,4 +95,3 @@ _CeruleanHouse2Text_74eb9:: text "All #MON will" line "obey you!" prompt - diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm index 465f1155..48d97e05 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/cerulean_city.asm @@ -230,4 +230,3 @@ _CeruleanCityText17:: para "The Tomboyish" line "Mermaid!" done - diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm index c5d67004..dd6baaff 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -129,4 +129,3 @@ _CeruleanGymText_5c82f:: line "we make a pretty" cont "darn good team!" done - diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/cerulean_trashed_house.asm index b23f4507..f79540ae 100644 --- a/text/maps/cerulean_trashed_house.asm +++ b/text/maps/cerulean_trashed_house.asm @@ -34,4 +34,3 @@ _CeruleanHouseTrashedText3:: text "TEAM ROCKET left" line "a way out!" done - diff --git a/text/maps/champion.asm b/text/maps/champion.asm index 51258818..3ca7aadf 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -144,4 +144,3 @@ _GaryText_7612a:: para $52, "!" line "Come with me!" done - diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm index c8df3fe4..b14f6f60 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -207,4 +207,3 @@ _CinnabarGymText_75ac7:: text $52, "! You beat" line "that fire brand!" done - diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm index d43c4d66..352ab8ea 100644 --- a/text/maps/cinnabar_island.asm +++ b/text/maps/cinnabar_island.asm @@ -35,4 +35,3 @@ _CinnabarIslandText7:: para "The Hot-Headed" line "Quiz Master!" done - diff --git a/text/maps/cinnabar_lab.asm b/text/maps/cinnabar_lab.asm index 74161166..a93a484d 100644 --- a/text/maps/cinnabar_lab.asm +++ b/text/maps/cinnabar_lab.asm @@ -27,4 +27,3 @@ _Lab1Text5:: text "#MON LAB" line "Testing Room" done - diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm index 38deb1ee..565104b3 100644 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ b/text/maps/cinnabar_lab_fossil_room.asm @@ -76,4 +76,3 @@ _Lab4Text_610bd:: text "Aiyah! You come" line "again!" done - diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm index b8034889..e2fbb558 100644 --- a/text/maps/cinnabar_lab_metronome_room.asm +++ b/text/maps/cinnabar_lab_metronome_room.asm @@ -61,4 +61,3 @@ _Lab3Text3:: _Lab3Text5:: text "An amber pipe!" done - diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/cinnabar_lab_trade_room.asm index 3c0a4bfe..196124e7 100644 --- a/text/maps/cinnabar_lab_trade_room.asm +++ b/text/maps/cinnabar_lab_trade_room.asm @@ -7,4 +7,3 @@ _Lab2Text1:: line "rare, prehistoric" cont "#MON!" done - diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm index 8f59f22f..90833127 100644 --- a/text/maps/copycats_house_2f.asm +++ b/text/maps/copycats_house_2f.asm @@ -94,4 +94,3 @@ _CopycatsHouse2FText_5cd17:: _CopycatsHouse2FText_5cd1c:: text "Huh? Can't see!" done - diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm index e2e58c0c..6e3c5737 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare_1.asm @@ -60,4 +60,3 @@ _DayCareMonNeedsMoreTimeText:: cont "needs some more" cont "time with me." prompt - diff --git a/text/maps/daycare_2.asm b/text/maps/daycare_2.asm index f0950812..20c0e5ad 100644 --- a/text/maps/daycare_2.asm +++ b/text/maps/daycare_2.asm @@ -31,4 +31,3 @@ _DayCareNotEnoughMoneyText:: text "Hey, you don't" line "have enough ¥!" done - diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/digletts_cave_route_11_entrance.asm index 16cdb562..ecd3225e 100644 --- a/text/maps/digletts_cave_route_11_entrance.asm +++ b/text/maps/digletts_cave_route_11_entrance.asm @@ -6,4 +6,3 @@ _DiglettsCaveEntRoute11Text1:: para "It goes right to" line "VIRIDIAN CITY!" done - diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/digletts_cave_route_2_entrance.asm index f6d5589c..a04bbef7 100644 --- a/text/maps/digletts_cave_route_2_entrance.asm +++ b/text/maps/digletts_cave_route_2_entrance.asm @@ -7,4 +7,3 @@ _DiglettsCaveRoute2Text1:: line "FLASH could light" cont "it up..." done - diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index 3e251e13..7477405c 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -141,4 +141,3 @@ _FanClubText8:: text "If someone brags," line "brag right back!" done - diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm index e8cdfb2e..3df069c1 100644 --- a/text/maps/fighting_dojo.asm +++ b/text/maps/fighting_dojo.asm @@ -128,4 +128,3 @@ _OtherHitmonText:: text "Better not get" line "greedy..." done - diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm index 3d6fa0c0..a90d0021 100644 --- a/text/maps/fuchsia_city.asm +++ b/text/maps/fuchsia_city.asm @@ -117,4 +117,3 @@ _FuchsiaCityKabutoText:: _FuchsiaCityText_19b2a:: text "..." done - diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm index 4f0c98b5..195dc8ef 100644 --- a/text/maps/fuchsia_fishing_house.asm +++ b/text/maps/fuchsia_fishing_house.asm @@ -41,4 +41,3 @@ _FuchsiaHouse3Text_5621c:: para "You have no room" line "for my gift!" done - diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/fuchsia_gym_1.asm index 3938f9af..9108fc79 100644 --- a/text/maps/fuchsia_gym_1.asm +++ b/text/maps/fuchsia_gym_1.asm @@ -24,4 +24,3 @@ _KogaAfterBattleText:: para "Here! Take the" line "SOULBADGE!" prompt - diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm index 8b7c84ac..ba1970e6 100644 --- a/text/maps/fuchsia_gym_2.asm +++ b/text/maps/fuchsia_gym_2.asm @@ -191,4 +191,3 @@ _FuchsiaGymText_75653:: line "ninja can terrify" cont "even now!" done - diff --git a/text/maps/fuchsia_house.asm b/text/maps/fuchsia_house.asm index a4b14eb6..7b6556b1 100644 --- a/text/maps/fuchsia_house.asm +++ b/text/maps/fuchsia_house.asm @@ -25,4 +25,3 @@ _FuchsiaHouse1Text3:: para "Did he show you?" done - diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/fuchsia_meeting_room.asm index 1fa81344..10675ead 100644 --- a/text/maps/fuchsia_meeting_room.asm +++ b/text/maps/fuchsia_meeting_room.asm @@ -24,4 +24,3 @@ _FuchsiaMeetingRoomText3:: para "I think he's got" line "a speech problem!" done - diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm index e75d46ea..7c61d1ed 100644 --- a/text/maps/fujis_house.asm +++ b/text/maps/fujis_house.asm @@ -83,4 +83,3 @@ _LavenderHouse1Text6:: para "Gone! It's been" line "clipped out!" done - diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index cf79e221..6c5dd40e 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -26,4 +26,3 @@ _HallofFameRoomText1:: cont "your #MON are" cont "HALL OF FAMERs!" done - diff --git a/text/maps/lance.asm b/text/maps/lance.asm index f6890896..3c75ce47 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -61,4 +61,3 @@ _LanceAfterBattleText:: para "He is the real" line "#MON LEAGUE" cont "champion!@@" - diff --git a/text/maps/lavender_house.asm b/text/maps/lavender_house.asm index d92f0c68..66cc85a5 100644 --- a/text/maps/lavender_house.asm +++ b/text/maps/lavender_house.asm @@ -22,4 +22,3 @@ _LavenderHouse2Text_1d9e1:: line "soothed its" cont "restless soul!" done - diff --git a/text/maps/lavender_town.asm b/text/maps/lavender_town.asm index d3b41ffa..19b6c8c8 100644 --- a/text/maps/lavender_town.asm +++ b/text/maps/lavender_town.asm @@ -62,4 +62,3 @@ _LavenderTownText9:: line "#MON Rest Easy" cont "#MON TOWER" done - diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm index 91e90b75..fdbb55b4 100644 --- a/text/maps/lorelei.asm +++ b/text/maps/lorelei.asm @@ -40,4 +40,3 @@ _LoreleiDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done - diff --git a/text/maps/mansion_1f.asm b/text/maps/mansion_1f.asm index 3ddd5660..a3c517fb 100644 --- a/text/maps/mansion_1f.asm +++ b/text/maps/mansion_1f.asm @@ -27,4 +27,3 @@ _MansionSwitchPressedText:: _MansionSwitchNotPressedText:: text "Not quite yet!" done - diff --git a/text/maps/mansion_2f.asm b/text/maps/mansion_2f.asm index c7e12408..378efb30 100644 --- a/text/maps/mansion_2f.asm +++ b/text/maps/mansion_2f.asm @@ -45,4 +45,3 @@ _Mansion2Text_520c7:: _Mansion2Text_520cc:: text "Not quite yet!" done - diff --git a/text/maps/mansion_3f.asm b/text/maps/mansion_3f.asm index 7e48a844..70331fdf 100644 --- a/text/maps/mansion_3f.asm +++ b/text/maps/mansion_3f.asm @@ -35,4 +35,3 @@ _Mansion3Text5:: para "We named the" line "newborn MEWTWO." done - diff --git a/text/maps/mansion_b1f.asm b/text/maps/mansion_b1f.asm index 78de2abb..1bc1ef89 100644 --- a/text/maps/mansion_b1f.asm +++ b/text/maps/mansion_b1f.asm @@ -37,4 +37,3 @@ _Mansion4Text7:: line "curb its vicious" cont "tendencies..." done - diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm index 78257980..8c37383d 100644 --- a/text/maps/mr_psychics_house.asm +++ b/text/maps/mr_psychics_house.asm @@ -23,4 +23,3 @@ _TM29NoRoomText:: text "Where do you plan" line "to put this?" done - diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/mt_moon_b1f.asm index 85cdee66..cd995ed5 100644 --- a/text/maps/mt_moon_b1f.asm +++ b/text/maps/mt_moon_b1f.asm @@ -1,4 +1,3 @@ _MtMoonText1:: db $0 done - diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index 29b167b5..46b4484c 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -105,4 +105,3 @@ _Museum1FText_5c2bc:: text "The AMBER is" line "clear and gold!" done - diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm index f43aef91..65d3e8a4 100644 --- a/text/maps/name_rater.asm +++ b/text/maps/name_rater.asm @@ -58,4 +58,3 @@ _NameRaterText_1dad1:: TX_RAM wcd6d text "!" done - diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 9aaac71c..52af450d 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -475,4 +475,3 @@ _OaksLabText_4424c:: line "entirely complete!" cont "Congratulations!" done - diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm index f912e16e..64b3325b 100644 --- a/text/maps/pallet_town.asm +++ b/text/maps/pallet_town.asm @@ -53,4 +53,3 @@ _PalletTownText6:: _PalletTownText7:: text $53,"'s house " done - diff --git a/text/maps/pewter_city.asm b/text/maps/pewter_city.asm index 0d7c7de7..03dfcc91 100644 --- a/text/maps/pewter_city.asm +++ b/text/maps/pewter_city.asm @@ -115,4 +115,3 @@ _PewterCityText12:: line "A Stone Gray" cont "City" done - diff --git a/text/maps/pewter_gym_1.asm b/text/maps/pewter_gym_1.asm index 1d56065b..6426dd72 100644 --- a/text/maps/pewter_gym_1.asm +++ b/text/maps/pewter_gym_1.asm @@ -16,4 +16,3 @@ _PewterGymText_5c49e:: cont "Fine then! Show" cont "me your best!" done - diff --git a/text/maps/pewter_house_1.asm b/text/maps/pewter_house_1.asm index 0fe3e165..450e8372 100644 --- a/text/maps/pewter_house_1.asm +++ b/text/maps/pewter_house_1.asm @@ -22,4 +22,3 @@ _PewterHouse1Text3:: para "If only we had" line "some BADGEs..." done - diff --git a/text/maps/pewter_house_2.asm b/text/maps/pewter_house_2.asm index 34ebc90d..615536f7 100644 --- a/text/maps/pewter_house_2.asm +++ b/text/maps/pewter_house_2.asm @@ -17,4 +17,3 @@ _PewterHouse2Text2:: para "But, it's not a" line "sure thing!" done - diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/pokemon_league_gate.asm index b817ef81..ac92f4b0 100644 --- a/text/maps/pokemon_league_gate.asm +++ b/text/maps/pokemon_league_gate.asm @@ -17,4 +17,3 @@ _Route22GateText_1e71a:: text "Oh! That is the" line "BOULDERBADGE!" cont "Go right ahead!@@" - diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/pokemon_tower_1f.asm index b9570d18..50a2cd29 100644 --- a/text/maps/pokemon_tower_1f.asm +++ b/text/maps/pokemon_tower_1f.asm @@ -29,4 +29,3 @@ _PokemonTower1Text5:: line "There are spirits" cont "up to mischief!" done - diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm index e41112a4..ec2281fd 100644 --- a/text/maps/pokemon_tower_2f.asm +++ b/text/maps/pokemon_tower_2f.asm @@ -55,4 +55,3 @@ _PokemonTower2Text2:: line "might be able to" cont "unmask them." done - diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/pokemon_tower_3f.asm index 443aecd5..67098e6b 100644 --- a/text/maps/pokemon_tower_3f.asm +++ b/text/maps/pokemon_tower_3f.asm @@ -43,4 +43,3 @@ _PokemonTower3AfterBattleText3:: text "My friends were" line "possessed too!" done - diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/pokemon_tower_4f.asm index e8fa75b6..771325a0 100644 --- a/text/maps/pokemon_tower_4f.asm +++ b/text/maps/pokemon_tower_4f.asm @@ -43,4 +43,3 @@ _PokemonTower4AfterBattleText3:: line "souls of #MON" cont "rest in peace..." done - diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/pokemon_tower_5f.asm index bbdc3d84..f2cadfcb 100644 --- a/text/maps/pokemon_tower_5f.asm +++ b/text/maps/pokemon_tower_5f.asm @@ -69,4 +69,3 @@ _PokemonTower5Text7:: para $52, "'s #MON" line "are fully healed!" done - diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/pokemon_tower_6f.asm index ff8bc73c..7532d56d 100644 --- a/text/maps/pokemon_tower_6f.asm +++ b/text/maps/pokemon_tower_6f.asm @@ -59,4 +59,3 @@ _PokemonTower6Text6:: text "Be gone..." line "Intruders..." done - diff --git a/text/maps/power_plant.asm b/text/maps/power_plant.asm index 2ea387d7..e5df6674 100644 --- a/text/maps/power_plant.asm +++ b/text/maps/power_plant.asm @@ -4,4 +4,3 @@ _VoltorbBattleText:: _ZapdosBattleText:: text "Gyaoo!@@" - diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index 729c5b46..8b82f2de 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -35,4 +35,3 @@ _StandByMeText:: _TVWrongSideText:: text "Oops, wrong side." done - diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/rock_tunnel_b1f.asm index 88659e8e..472c52f8 100644 --- a/text/maps/rock_tunnel_b1f.asm +++ b/text/maps/rock_tunnel_b1f.asm @@ -113,4 +113,3 @@ _RockTunnel1Text8:: line "CERULEAN CITY -" cont "LAVENDER TOWN" done - diff --git a/text/maps/rock_tunnel_b2f_1.asm b/text/maps/rock_tunnel_b2f_1.asm index e859a7f9..1a565eb3 100644 --- a/text/maps/rock_tunnel_b2f_1.asm +++ b/text/maps/rock_tunnel_b2f_1.asm @@ -106,4 +106,3 @@ _RockTunnel2EndBattleText8:: text "Fired" line "away!" prompt - diff --git a/text/maps/rock_tunnel_b2f_2.asm b/text/maps/rock_tunnel_b2f_2.asm index 646ccd02..e8e45a7f 100644 --- a/text/maps/rock_tunnel_b2f_2.asm +++ b/text/maps/rock_tunnel_b2f_2.asm @@ -18,4 +18,3 @@ _RockTunnel2AfterBattleText9:: text "I'm an artist," line "not a fighter." done - diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/rocket_hideout_b1f.asm index 66ac1fbd..36117804 100644 --- a/text/maps/rocket_hideout_b1f.asm +++ b/text/maps/rocket_hideout_b1f.asm @@ -71,4 +71,3 @@ _RocketHideout1AfterBattleTxt6:: text "Uh-oh, that fight" line "opened the door!" done - diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/rocket_hideout_b2f.asm index 1b0e9439..c13c3593 100644 --- a/text/maps/rocket_hideout_b2f.asm +++ b/text/maps/rocket_hideout_b2f.asm @@ -15,4 +15,3 @@ _RocketHideout2AfterBattleTxt2:: cont "floors. Can you" cont "reach the BOSS?" done - diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/rocket_hideout_b3f.asm index 67bc9c24..a146a383 100644 --- a/text/maps/rocket_hideout_b3f.asm +++ b/text/maps/rocket_hideout_b3f.asm @@ -33,4 +33,3 @@ _RocketHide3AfterBattleText3:: cont "LIFT KEY to run" cont "the elevator!" done - diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm index 6d84305a..f3ba43f3 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/rocket_hideout_b4f.asm @@ -72,4 +72,3 @@ _RocketHideout4Text_455ec:: text "Oh no! I dropped" line "the LIFT KEY!" done - diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/rocket_hideout_elevator.asm index c2ce930b..6f2aa638 100644 --- a/text/maps/rocket_hideout_elevator.asm +++ b/text/maps/rocket_hideout_elevator.asm @@ -1,4 +1,3 @@ _RocketElevatorText_4578b:: text "It appears to" line "need a key.@@" - diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm index e343ea6f..adffd705 100644 --- a/text/maps/route_1.asm +++ b/text/maps/route_1.asm @@ -47,4 +47,3 @@ _Route1Text3:: line "PALLET TOWN -" cont "VIRIDIAN CITY" done - diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm index 19d5fa2b..057ddcb5 100644 --- a/text/maps/route_10.asm +++ b/text/maps/route_10.asm @@ -107,4 +107,3 @@ _Route10Text7:: _Route10Text10:: text "POWER PLANT" done - diff --git a/text/maps/route_11_1.asm b/text/maps/route_11_1.asm index e10825e9..13e37bdf 100644 --- a/text/maps/route_11_1.asm +++ b/text/maps/route_11_1.asm @@ -131,5 +131,3 @@ _Route11BattleText9:: text "Watch out for" line "live wires!" done - - diff --git a/text/maps/route_11_2.asm b/text/maps/route_11_2.asm index 537fea42..b9b68d6d 100644 --- a/text/maps/route_11_2.asm +++ b/text/maps/route_11_2.asm @@ -26,4 +26,3 @@ _Route11AfterBattleText10:: _Route11Text11:: text "DIGLETT's CAVE" done - diff --git a/text/maps/route_11_gate.asm b/text/maps/route_11_gate.asm index db9ad871..ef371d06 100644 --- a/text/maps/route_11_gate.asm +++ b/text/maps/route_11_gate.asm @@ -12,4 +12,3 @@ _Route11GateText1:: para "He'll help you" line "rename them too!" done - diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/route_11_gate_upstairs.asm index 92eea2fb..10236081 100644 --- a/text/maps/route_11_gate_upstairs.asm +++ b/text/maps/route_11_gate_upstairs.asm @@ -38,4 +38,3 @@ _Route11GateUpstairsText_494d5:: cont "is by way of the" cont "ROCK TUNNEL." done - diff --git a/text/maps/route_12.asm b/text/maps/route_12.asm index b0d05a30..82696fda 100644 --- a/text/maps/route_12.asm +++ b/text/maps/route_12.asm @@ -137,4 +137,3 @@ _Route12Text11:: _Route12Text12:: text "SPORT FISHING AREA" done - diff --git a/text/maps/route_12_gate.asm b/text/maps/route_12_gate.asm index 246c3eac..51d75539 100644 --- a/text/maps/route_12_gate.asm +++ b/text/maps/route_12_gate.asm @@ -2,4 +2,3 @@ _Route12GateText1:: text "There's a lookout" line "spot upstairs." done - diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm index a9d74099..1f2af788 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/route_12_gate_upstairs.asm @@ -40,4 +40,3 @@ _Route12GateUpstairsText_495c4:: para "It's #MON TOWER!" done - diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm index 97046b75..4cb4beee 100644 --- a/text/maps/route_12_house.asm +++ b/text/maps/route_12_house.asm @@ -58,4 +58,3 @@ _Route12HouseText_564d9:: line "you, but you have" cont "no room for it!" done - diff --git a/text/maps/route_13.asm b/text/maps/route_13.asm index c7034eb5..e2718919 100644 --- a/text/maps/route_13.asm +++ b/text/maps/route_13.asm @@ -177,4 +177,3 @@ _Route13Text13:: line "North to SILENCE" cont "BRIDGE" done - diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm index 1371b5b0..18e85ed4 100644 --- a/text/maps/route_14.asm +++ b/text/maps/route_14.asm @@ -171,4 +171,3 @@ _Route14Text11:: line "West to FUCHSIA" cont "CITY" done - diff --git a/text/maps/route_15.asm b/text/maps/route_15.asm index 1368b3d5..a23b8500 100644 --- a/text/maps/route_15.asm +++ b/text/maps/route_15.asm @@ -169,4 +169,3 @@ _Route15Text12:: line "West to FUCHSIA" cont "CITY" done - diff --git a/text/maps/route_15_gate.asm b/text/maps/route_15_gate.asm index eb4ca6d3..0a526142 100644 --- a/text/maps/route_15_gate.asm +++ b/text/maps/route_15_gate.asm @@ -5,4 +5,3 @@ _Route15GateText1:: para "PROF.OAK's AIDE" line "came by here." done - diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/route_15_gate_upstairs.asm index 310ecdba..ade4a358 100644 --- a/text/maps/route_15_gate_upstairs.asm +++ b/text/maps/route_15_gate_upstairs.asm @@ -22,4 +22,3 @@ _Route15GateUpstairsText_49698:: para "It looks like a" line "small island!" done - diff --git a/text/maps/route_16.asm b/text/maps/route_16.asm index 740ef8a1..45265829 100644 --- a/text/maps/route_16.asm +++ b/text/maps/route_16.asm @@ -118,4 +118,3 @@ _Route16Text9:: line "CELADON CITY -" cont "FUCHSIA CITY" done - diff --git a/text/maps/route_16_gate.asm b/text/maps/route_16_gate.asm index f4f03e2f..f548977f 100644 --- a/text/maps/route_16_gate.asm +++ b/text/maps/route_16_gate.asm @@ -20,4 +20,3 @@ _Route16GateText2:: text "How'd you get in?" line "Good effort!" done - diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/route_16_gate_upstairs.asm index 55a49274..d76b70ca 100644 --- a/text/maps/route_16_gate_upstairs.asm +++ b/text/maps/route_16_gate_upstairs.asm @@ -24,4 +24,3 @@ _Route16GateUpstairsText_49847:: para "There's a long" line "path over water!" done - diff --git a/text/maps/route_16_house.asm b/text/maps/route_16_house.asm index d84faf38..534cee08 100644 --- a/text/maps/route_16_house.asm +++ b/text/maps/route_16_house.asm @@ -29,4 +29,3 @@ _HM02NoRoomText:: _Route16HouseText_1e652:: text "FEAROW: Kyueen!" done - diff --git a/text/maps/route_17.asm b/text/maps/route_17.asm index db9bf4d2..a0affd90 100644 --- a/text/maps/route_17.asm +++ b/text/maps/route_17.asm @@ -193,4 +193,3 @@ _Route17Text16:: text "CYCLING ROAD" line "Slope ends here!" done - diff --git a/text/maps/route_18.asm b/text/maps/route_18.asm index 31e921bd..d09caf82 100644 --- a/text/maps/route_18.asm +++ b/text/maps/route_18.asm @@ -56,4 +56,3 @@ _Route18Text5:: line "No pedestrians" cont "permitted!" done - diff --git a/text/maps/route_18_gate.asm b/text/maps/route_18_gate.asm index 964a32e5..f2f51039 100644 --- a/text/maps/route_18_gate.asm +++ b/text/maps/route_18_gate.asm @@ -12,4 +12,3 @@ _Route18GateText_4992d:: _Route18GateText_49932:: text "Excuse me!" done - diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/route_18_gate_upstairs.asm index a1778cb6..0fd2de09 100644 --- a/text/maps/route_18_gate_upstairs.asm +++ b/text/maps/route_18_gate_upstairs.asm @@ -13,5 +13,3 @@ _Route18GateUpstairsText_4999f:: para "There are people" line "swimming!" done - - diff --git a/text/maps/route_19.asm b/text/maps/route_19.asm index ae6e7334..244e31d0 100644 --- a/text/maps/route_19.asm +++ b/text/maps/route_19.asm @@ -155,4 +155,3 @@ _Route19Text11:: line "FUCHSIA CITY -" cont "SEAFOAM ISLANDS" done - diff --git a/text/maps/route_2.asm b/text/maps/route_2.asm index 2419abbe..dd7becc0 100644 --- a/text/maps/route_2.asm +++ b/text/maps/route_2.asm @@ -7,4 +7,3 @@ _Route2Text3:: _Route2Text4:: text "DIGLETT's CAVE" done - diff --git a/text/maps/route_20.asm b/text/maps/route_20.asm index c69dec51..1ccf0b6c 100644 --- a/text/maps/route_20.asm +++ b/text/maps/route_20.asm @@ -154,4 +154,3 @@ _Route20Text12:: _Route20Text11:: text "SEAFOAM ISLANDS" done - diff --git a/text/maps/route_21.asm b/text/maps/route_21.asm index d94bdfac..3451953f 100644 --- a/text/maps/route_21.asm +++ b/text/maps/route_21.asm @@ -135,4 +135,3 @@ _Route21AfterBattleText9:: text "Oh wait! I got a" line "bite! Yeah!" done - diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index 2a46d5b4..f2d7ae96 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -102,4 +102,3 @@ _Route22FrontGateText:: text "#MON LEAGUE" line "Front Gate" done - diff --git a/text/maps/route_23.asm b/text/maps/route_23.asm index 0807cc91..2ecb020e 100644 --- a/text/maps/route_23.asm +++ b/text/maps/route_23.asm @@ -36,4 +36,3 @@ _Route23Text8:: text "VICTORY ROAD GATE" line "- #MON LEAGUE" done - diff --git a/text/maps/route_24_1.asm b/text/maps/route_24_1.asm index 3a8d6d9a..25079b2f 100644 --- a/text/maps/route_24_1.asm +++ b/text/maps/route_24_1.asm @@ -62,4 +62,3 @@ _Route24BattleText1:: text "I saw your feat" line "from the grass!" done - diff --git a/text/maps/route_24_2.asm b/text/maps/route_24_2.asm index 12a8a59d..325dea13 100644 --- a/text/maps/route_24_2.asm +++ b/text/maps/route_24_2.asm @@ -88,4 +88,3 @@ _Route24AfterBattleText6:: text "I did my best, I" line "have no regrets!" done - diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm index b89396ea..325ab348 100644 --- a/text/maps/route_25.asm +++ b/text/maps/route_25.asm @@ -154,4 +154,3 @@ _Route25Text11:: text "SEA COTTAGE" line "BILL lives here!" done - diff --git a/text/maps/route_2_gate.asm b/text/maps/route_2_gate.asm index 6be23d54..566830f8 100644 --- a/text/maps/route_2_gate.asm +++ b/text/maps/route_2_gate.asm @@ -10,4 +10,3 @@ _Route2GateText2:: cont "can get through" cont "ROCK TUNNEL." done - diff --git a/text/maps/route_2_house.asm b/text/maps/route_2_house.asm index 098a8f3e..46fc1062 100644 --- a/text/maps/route_2_house.asm +++ b/text/maps/route_2_house.asm @@ -4,4 +4,3 @@ _Route2HouseText1:: cont "it can still use " cont "moves like CUT!" done - diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm index f9496c89..966a0786 100644 --- a/text/maps/route_3.asm +++ b/text/maps/route_3.asm @@ -143,4 +143,3 @@ _Route3Text10:: text "ROUTE 3" line "MT.MOON AHEAD" done - diff --git a/text/maps/route_4.asm b/text/maps/route_4.asm index e49f1b7a..0a36f4cd 100644 --- a/text/maps/route_4.asm +++ b/text/maps/route_4.asm @@ -33,4 +33,3 @@ _Route4Text6:: line "MT.MOON -" cont "CERULEAN CITY" done - diff --git a/text/maps/route_5.asm b/text/maps/route_5.asm index 4fced687..54ff0f84 100644 --- a/text/maps/route_5.asm +++ b/text/maps/route_5.asm @@ -3,4 +3,3 @@ _Route5Text1:: line "CERULEAN CITY -" cont "VERMILION CITY" done - diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm index f98bcaf8..c48b5d3d 100644 --- a/text/maps/route_6.asm +++ b/text/maps/route_6.asm @@ -95,4 +95,3 @@ _Route6Text7:: line "CERULEAN CITY -" cont "VERMILION CITY" done - diff --git a/text/maps/route_7.asm b/text/maps/route_7.asm index 24645b90..6500be96 100644 --- a/text/maps/route_7.asm +++ b/text/maps/route_7.asm @@ -3,4 +3,3 @@ _Route7Text1:: line "CELADON CITY -" cont "LAVENDER TOWN" done - diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm index f59feb87..57a9a5f9 100644 --- a/text/maps/route_8.asm +++ b/text/maps/route_8.asm @@ -152,4 +152,3 @@ _Route8Text10:: line "CELADON CITY -" cont "LAVENDER TOWN" done - diff --git a/text/maps/route_9.asm b/text/maps/route_9.asm index c440eca9..9975000d 100644 --- a/text/maps/route_9.asm +++ b/text/maps/route_9.asm @@ -155,4 +155,3 @@ _Route9Text11:: line "CERULEAN CITY-" cont "ROCK TUNNEL" done - diff --git a/text/maps/safari_zone_center.asm b/text/maps/safari_zone_center.asm index 50ed1e1e..09918f93 100644 --- a/text/maps/safari_zone_center.asm +++ b/text/maps/safari_zone_center.asm @@ -9,4 +9,3 @@ _SafariZoneCenterText3:: line "Button to check" cont "remaining time!" done - diff --git a/text/maps/safari_zone_east.asm b/text/maps/safari_zone_east.asm index 78634e4a..eebe5de7 100644 --- a/text/maps/safari_zone_east.asm +++ b/text/maps/safari_zone_east.asm @@ -14,4 +14,3 @@ _SafariZoneEastText7:: text "CENTER AREA" line "NORTH: AREA 2" done - diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm index 22c179f3..8a018b2d 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/safari_zone_entrance.asm @@ -91,50 +91,3 @@ _SafariZoneEntranceText_753f0:: text "Sorry, you're a" line "regular here!" done - -IF DEF(_OPTION_LOWCOST_SAFARI) -_SafariZoneLowCostText1:: - db 0 - para "Oh, all right, pay" - line "me what you have." - prompt - -_SafariZoneLowCostText2:: - text "But, I can't give" - line "you all 30 BALLs." - done - -_SafariZoneLowCostText3:: - db 0 - para "You're persistent," - line "aren't you?" - - para "OK, you can go in" - line "for free, but" - cont "just this once!@@" - -_SafariZoneLowCostText4:: - db 0 - done - -_SafariZoneLowCostText5:: - text "I'm sorry, but you" - line "have to pay to" - cont "enter." - done - -_SafariZoneLowCostText6:: - text "You can't enter" - line "without paying!" - done - -_SafariZoneLowCostText7:: - text "I said, no money," - line "no entry!" - done - -_SafariZoneLowCostText8:: - text "Read my lips, NO!" - line "Get it?" - done -ENDC diff --git a/text/maps/safari_zone_north.asm b/text/maps/safari_zone_north.asm index fdf8b5e8..1e148f0b 100644 --- a/text/maps/safari_zone_north.asm +++ b/text/maps/safari_zone_north.asm @@ -31,4 +31,3 @@ _SafariZoneNorthText7:: line "finding the" cont "SECRET HOUSE!" done - diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/safari_zone_rest_house_1.asm index 2731bdb4..b6c87818 100644 --- a/text/maps/safari_zone_rest_house_1.asm +++ b/text/maps/safari_zone_rest_house_1.asm @@ -9,4 +9,3 @@ _SafariZoneRestHouse1Text2:: line "#MON to take" cont "home as gifts!" done - diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/safari_zone_rest_house_2.asm index 6cdca9c0..94802b13 100644 --- a/text/maps/safari_zone_rest_house_2.asm +++ b/text/maps/safari_zone_rest_house_2.asm @@ -17,4 +17,3 @@ _SafariZoneRestHouse2Text3:: line "I didn't see any" cont "#MON I wanted." done - diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/safari_zone_rest_house_3.asm index f40c3009..d5f7abc8 100644 --- a/text/maps/safari_zone_rest_house_3.asm +++ b/text/maps/safari_zone_rest_house_3.asm @@ -16,4 +16,3 @@ _SafariZoneRestHouse3Text3:: text "Whew! I'm tired" line "from all the fun!" done - diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/safari_zone_rest_house_4.asm index e50c4522..93f02c8f 100644 --- a/text/maps/safari_zone_rest_house_4.asm +++ b/text/maps/safari_zone_rest_house_4.asm @@ -25,4 +25,3 @@ _SafariZoneRestHouse4Text3:: cont "a VAPOREON!" cont "I wonder why?" done - diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm index f285a697..1bbe89fd 100644 --- a/text/maps/safari_zone_secret_house.asm +++ b/text/maps/safari_zone_secret_house.asm @@ -42,4 +42,3 @@ _HM03NoRoomText:: line "room for this" cont "fabulous prize!" done - diff --git a/text/maps/safari_zone_west.asm b/text/maps/safari_zone_west.asm index e10df2a3..dcb2fe6c 100644 --- a/text/maps/safari_zone_west.asm +++ b/text/maps/safari_zone_west.asm @@ -29,4 +29,3 @@ _SafariZoneWestText8:: text "AREA 3" line "EAST: CENTER AREA" done - diff --git a/text/maps/saffron_city.asm b/text/maps/saffron_city.asm index 82687181..a0422c8c 100644 --- a/text/maps/saffron_city.asm +++ b/text/maps/saffron_city.asm @@ -149,4 +149,3 @@ _SaffronCityText25:: para "Release to be" line "determined..." done - diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm index 30ad6cbd..c16e880e 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/saffron_gates.asm @@ -34,4 +34,3 @@ _SaffronGateText_1dff6:: text "Hi, thanks for" line "the cool drinks!" done - diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm index f44baaea..ba57e35d 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/saffron_gym.asm @@ -234,4 +234,3 @@ _SaffronGymAfterBattleText7:: line "used telepathy to" cont "read your mind!" done - diff --git a/text/maps/saffron_house.asm b/text/maps/saffron_house.asm index 21ed3b89..214bf089 100644 --- a/text/maps/saffron_house.asm +++ b/text/maps/saffron_house.asm @@ -24,4 +24,3 @@ _SaffronHouse1Text4:: line "increasing the PP" cont "of techniques!" done - diff --git a/text/maps/seafoam_islands_1f.asm b/text/maps/seafoam_islands_1f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_1f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b1f.asm b/text/maps/seafoam_islands_b1f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_b1f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b2f.asm b/text/maps/seafoam_islands_b2f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_b2f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b3f.asm b/text/maps/seafoam_islands_b3f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_b3f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/seafoam_islands_b4f.asm index dccb43c0..608d165f 100644 --- a/text/maps/seafoam_islands_b4f.asm +++ b/text/maps/seafoam_islands_b4f.asm @@ -11,4 +11,3 @@ _SeafoamIslands5Text5:: text "DANGER" line "Fast current!" done - diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 2986f3af..7fccab4f 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -132,4 +132,3 @@ _SilphCo10Text_6237b:: text "The monitor has" line "#MON on it!" done - diff --git a/text/maps/silph_co_1f.asm b/text/maps/silph_co_1f.asm index ca166d31..1ef80189 100644 --- a/text/maps/silph_co_1f.asm +++ b/text/maps/silph_co_1f.asm @@ -5,4 +5,3 @@ _SilphCo1Text1:: line "in the boardroom" cont "on 11F!" done - diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index 819a08c1..a48ebd23 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -94,4 +94,3 @@ _SilphCo2AfterBattleText4:: line "be merged with" cont "TEAM ROCKET!" done - diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm index 0374482d..a514d3ef 100644 --- a/text/maps/silph_co_3f.asm +++ b/text/maps/silph_co_3f.asm @@ -44,4 +44,3 @@ _SilphCo3AfterBattleText2:: cont "them, they'd let" cont "me study #MON!" done - diff --git a/text/maps/silph_co_4f.asm b/text/maps/silph_co_4f.asm index 19494482..5b484ec7 100644 --- a/text/maps/silph_co_4f.asm +++ b/text/maps/silph_co_4f.asm @@ -54,4 +54,3 @@ _SilphCo4AfterBattleText4:: text "I better tell the" line "BOSS on 11F!" done - diff --git a/text/maps/silph_co_5f_2.asm b/text/maps/silph_co_5f_2.asm index da0c6e6f..3c1b8ead 100644 --- a/text/maps/silph_co_5f_2.asm +++ b/text/maps/silph_co_5f_2.asm @@ -53,4 +53,3 @@ _SilphCo5Text11:: line "only when traded" cont "by link-cable." done - diff --git a/text/maps/silph_co_6f.asm b/text/maps/silph_co_6f.asm index b3a38aa0..90456b5c 100644 --- a/text/maps/silph_co_6f.asm +++ b/text/maps/silph_co_6f.asm @@ -105,4 +105,3 @@ _SilphCo6AfterBattleText4:: line "justice, you" cont "betray evil!" done - diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm index f29c16bc..e6ad11c1 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/silph_co_7f.asm @@ -207,4 +207,3 @@ _SilphCo7Text_51ed2:: cont "Don't sweat it!" cont "Smell ya!" done - diff --git a/text/maps/silph_co_8f.asm b/text/maps/silph_co_8f.asm index 898c0600..fabae5e6 100644 --- a/text/maps/silph_co_8f.asm +++ b/text/maps/silph_co_8f.asm @@ -54,4 +54,3 @@ _SilphCo8AfterBattleText3:: text "I'll leave you up" line "to my brothers!" done - diff --git a/text/maps/silph_co_9f.asm b/text/maps/silph_co_9f.asm index f01ffb7b..fd1aa91c 100644 --- a/text/maps/silph_co_9f.asm +++ b/text/maps/silph_co_9f.asm @@ -60,4 +60,3 @@ _SilphCo9AfterBattleText3:: text "My brothers will" line "avenge me!" done - diff --git a/text/maps/ss_anne_1.asm b/text/maps/ss_anne_1.asm index 6032b770..2bbdcbac 100644 --- a/text/maps/ss_anne_1.asm +++ b/text/maps/ss_anne_1.asm @@ -19,4 +19,3 @@ _SSAnne1Text2:: line "challenged by the" cont "more bored ones!" done - diff --git a/text/maps/ss_anne_10.asm b/text/maps/ss_anne_10.asm index f1eb8a77..7df629b5 100644 --- a/text/maps/ss_anne_10.asm +++ b/text/maps/ss_anne_10.asm @@ -110,4 +110,3 @@ _SSAnne10Text7:: line "STRENGTH to move" cont "big rocks!" done - diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm index bd33b9d3..ba231ac5 100644 --- a/text/maps/ss_anne_2.asm +++ b/text/maps/ss_anne_2.asm @@ -61,4 +61,3 @@ _SSAnneRivalCaptainText:: para "You should go see" line "him! Smell ya!" done - diff --git a/text/maps/ss_anne_3.asm b/text/maps/ss_anne_3.asm index 8ac96d88..76490594 100644 --- a/text/maps/ss_anne_3.asm +++ b/text/maps/ss_anne_3.asm @@ -5,4 +5,3 @@ _SSAnne3Text1:: para "He even teaches" line "CUT to #MON!" done - diff --git a/text/maps/ss_anne_4.asm b/text/maps/ss_anne_4.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/ss_anne_4.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/ss_anne_5.asm b/text/maps/ss_anne_5.asm index b4935f5b..76cd5631 100644 --- a/text/maps/ss_anne_5.asm +++ b/text/maps/ss_anne_5.asm @@ -50,4 +50,3 @@ _SSAnne5AfterBattleText2:: cont "#MON. I think" cont "there are more." done - diff --git a/text/maps/ss_anne_6.asm b/text/maps/ss_anne_6.asm index 51c941a8..7fcc9973 100644 --- a/text/maps/ss_anne_6.asm +++ b/text/maps/ss_anne_6.asm @@ -67,4 +67,3 @@ _SSAnne6Text_61816:: para "But, have I enough" line "fillets du beef?" done - diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm index 4687c421..bb8ca042 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -60,4 +60,3 @@ _SSAnne7Text3:: cont "The CAPTAIN's" cont "reading this!" done - diff --git a/text/maps/ss_anne_8.asm b/text/maps/ss_anne_8.asm index 393633e3..7a09303e 100644 --- a/text/maps/ss_anne_8.asm +++ b/text/maps/ss_anne_8.asm @@ -102,4 +102,3 @@ _SSAnne8Text11:: para "I'm on the trail" line "of TEAM ROCKET!" done - diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm index efdc014a..a9be8cee 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/ss_anne_9.asm @@ -111,4 +111,3 @@ _SSAnne9AfterBattleText4:: text "Oh, I adore your" line "strong #MON!" done - diff --git a/text/maps/underground_path_route_5_entrance.asm b/text/maps/underground_path_route_5_entrance.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/underground_path_route_5_entrance.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/underground_path_route_6_entrance.asm index c898d199..dacc44f7 100644 --- a/text/maps/underground_path_route_6_entrance.asm +++ b/text/maps/underground_path_route_6_entrance.asm @@ -3,4 +3,3 @@ _UndergrdTunnelEntRoute6Text1:: line "things in that" cont "UNDERGROUND PATH." done - diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/underground_path_route_7_entrance.asm index dee62853..5cde3614 100644 --- a/text/maps/underground_path_route_7_entrance.asm +++ b/text/maps/underground_path_route_7_entrance.asm @@ -3,4 +3,3 @@ _UndergroundPathEntRoute7Text1:: line "#MON appeared" cont "near CELADON CITY." done - diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm index 057c7b0c..4e0dc3ca 100644 --- a/text/maps/underground_path_route_7_entrance_unused.asm +++ b/text/maps/underground_path_route_7_entrance_unused.asm @@ -33,4 +33,3 @@ _UGPathRoute7EntranceUnusedText_5d782:: cont "to the building" cont "across the road." done - diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/underground_path_route_8_entrance.asm index 0df1dec9..da785c8e 100644 --- a/text/maps/underground_path_route_8_entrance.asm +++ b/text/maps/underground_path_route_8_entrance.asm @@ -3,4 +3,3 @@ _UndergroundPathEntRoute8Text1:: line "in CELADON has a" cont "great selection!" done - diff --git a/text/maps/unknown_dungeon_1f.asm b/text/maps/unknown_dungeon_1f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/unknown_dungeon_1f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/unknown_dungeon_2f.asm b/text/maps/unknown_dungeon_2f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/unknown_dungeon_2f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/unknown_dungeon_b1f.asm index 4db8467f..0918a3ce 100644 --- a/text/maps/unknown_dungeon_b1f.asm +++ b/text/maps/unknown_dungeon_b1f.asm @@ -1,3 +1,2 @@ _MewtwoBattleText:: text "Mew!@@" - diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index 07ed1b96..ff90cbef 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -124,4 +124,3 @@ _VermilionCityText12:: _VermilionCityText13:: text "VERMILION HARBOR" done - diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm index 28b75731..5d998e82 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/vermilion_dock.asm @@ -1,4 +1,3 @@ _VermilionDockText1:: text "" done - diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm index 59f730db..0fa28cae 100644 --- a/text/maps/vermilion_fishing_house.asm +++ b/text/maps/vermilion_fishing_house.asm @@ -51,4 +51,3 @@ _VermilionHouse2Text_560ca:: para "You have no room" line "for my gift!" done - diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm index e347edb9..4fd5e159 100644 --- a/text/maps/vermilion_gym_2.asm +++ b/text/maps/vermilion_gym_2.asm @@ -141,4 +141,3 @@ _VermilionGymText_5cbf9:: text "Whew! That match" line "was electric!" done - diff --git a/text/maps/vermilion_house.asm b/text/maps/vermilion_house.asm index 806a4b8a..91c18708 100644 --- a/text/maps/vermilion_house.asm +++ b/text/maps/vermilion_house.asm @@ -19,4 +19,3 @@ _VermilionHouse1Text3:: para "VERMILION appears" line "to be safe." done - diff --git a/text/maps/victory_road_1f.asm b/text/maps/victory_road_1f.asm index ded9afd6..1523db88 100644 --- a/text/maps/victory_road_1f.asm +++ b/text/maps/victory_road_1f.asm @@ -29,4 +29,3 @@ _VictoryRoad1AfterBattleText2:: text "I concede, you're" line "better than me!" done - diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm index bc1b6cd9..cdcf6e36 100644 --- a/text/maps/victory_road_2f.asm +++ b/text/maps/victory_road_2f.asm @@ -83,4 +83,3 @@ _VictoryRoad2AfterBattleText5:: line "up the challenge" cont "here." done - diff --git a/text/maps/victory_road_3f.asm b/text/maps/victory_road_3f.asm index 66364190..07e0be70 100644 --- a/text/maps/victory_road_3f.asm +++ b/text/maps/victory_road_3f.asm @@ -61,4 +61,3 @@ _VictoryRoad3AfterBattleText5:: line "battles, you get" cont "stronger!" done - diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index feedd017..17b2ec91 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -178,4 +178,3 @@ _ViridianCityText14:: text "The GYM's doors" line "are locked..." done - diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm index 8eaf7738..813b193a 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/viridian_forest.asm @@ -121,4 +121,3 @@ _ViridianForestText14:: line "VIRIDIAN FOREST" cont "PEWTER CITY AHEAD" done - diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/viridian_forest_exit.asm index 04dea7e5..ab6a5a1d 100644 --- a/text/maps/viridian_forest_exit.asm +++ b/text/maps/viridian_forest_exit.asm @@ -17,4 +17,3 @@ _ViridianForestExitText2:: line "down by a special" cont "#MON move." done - diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm index a308681a..df04e6d6 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/viridian_gym.asm @@ -234,4 +234,3 @@ _ViridianGymText_74bd9:: line "GIOVANNI was the" cont "GYM LEADER here?" done - diff --git a/text/maps/viridian_house.asm b/text/maps/viridian_house.asm index 5adf059b..757f597a 100644 --- a/text/maps/viridian_house.asm +++ b/text/maps/viridian_house.asm @@ -21,4 +21,3 @@ _ViridianHouseText4:: text "SPEAROW" line "Name: SPEARY" done - diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm index 09ab1443..d4da3781 100644 --- a/text/maps/wardens_house.asm +++ b/text/maps/wardens_house.asm @@ -81,4 +81,3 @@ _FuchsiaHouse2Text_7517b:: text "Old #MON" line "merchandise." done - -- cgit v1.3.1-sl0p From 2a529796374f3798fb507931a7c8a9bad4281107 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 9 Jun 2016 18:02:29 -0400 Subject: Rebump extras. af6fa345d689844429d20df9a18f6ae298733140 didn't take. I don't know why. --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras b/extras index 698b0fc7..0e179893 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 698b0fc7e63d3dadf07247015e230bce145cc500 +Subproject commit 0e1798937a4bf723813574281d0dc12c471c9199 -- cgit v1.3.1-sl0p From 8b3f9b244d72169e04a617eba0b36cae002b31a5 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Thu, 9 Jun 2016 20:50:31 -0400 Subject: Try again to bump extras --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras b/extras index 698b0fc7..0e179893 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 698b0fc7e63d3dadf07247015e230bce145cc500 +Subproject commit 0e1798937a4bf723813574281d0dc12c471c9199 -- cgit v1.3.1-sl0p From d8dae96f35222ababb9688ce2aed3292515f8ca2 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Thu, 9 Jun 2016 21:20:02 -0400 Subject: Implement handy text macros from yellow --- engine/hidden_object_functions17.asm | 2 +- engine/hidden_object_functions18.asm | 2 +- macros.asm | 34 ++++++++++++++++++++++------------ scripts/billshouse.asm | 6 ++++-- scripts/celadongamecorner.asm | 9 ++++++--- scripts/celadonmartroof.asm | 24 ++++++++++++------------ scripts/celadonpokecenter.asm | 4 ++-- scripts/celadonprizeroom.asm | 2 +- scripts/ceruleanpokecenter.asm | 4 ++-- scripts/cinnabarpokecenter.asm | 4 ++-- scripts/fuchsiapokecenter.asm | 4 ++-- scripts/indigoplateaulobby.asm | 4 ++-- scripts/lavenderpokecenter.asm | 4 ++-- scripts/pewterpokecenter.asm | 11 +++++------ scripts/saffronpokecenter.asm | 4 ++-- scripts/vermilionpokecenter.asm | 4 ++-- scripts/viridianpokecenter.asm | 4 ++-- 17 files changed, 70 insertions(+), 56 deletions(-) diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index ffcc33c3..67cba382 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -11,7 +11,7 @@ OpenRedsPC: ; 5db86 (17:5b86) tx_pre_jump RedBedroomPCText RedBedroomPCText: ; 5db8e (17:5b8e) - db $fc ; FuncTX_ItemStoragePC + TX_PLAYERS_PC Route15GateLeftBinoculars: ; 5db8f (17:5b8f) ld a, [wSpriteStateData1 + 9] diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index ab66a818..e8b990e5 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -195,4 +195,4 @@ OpenPokemonCenterPC: ; 62516 (18:6516) tx_pre_jump PokemonCenterPCText PokemonCenterPCText: ; 62529 (18:6529) - db $F9 ; FuncTX_PokemonCenterPC + TX_POKECENTER_PC diff --git a/macros.asm b/macros.asm index e85cd61f..8475582c 100644 --- a/macros.asm +++ b/macros.asm @@ -205,15 +205,13 @@ TX_RAM: MACRO ENDM TX_BCD: MACRO +; \1: RAM address to read from +; \2: number of bytes + print flags db $2 dw \1 db \2 ENDM -TX_ASM: MACRO - db $08 - ENDM - TX_MART: MACRO db $FE, _NARG rept _NARG @@ -223,6 +221,22 @@ TX_MART: MACRO db $FF ENDM +TX_LINE EQUS "db $05" +TX_BUTTON_SOUND EQUS "db $06" +TX_ASM EQUS "db $08" +TX_SFX_ITEM EQUS "db $0b" +TX_WAIT_BUTTON EQUS "db $0d" +TX_SFX_CONGRATS EQUS "db $10" +TX_SFX_KEY_ITEM EQUS "db $11" + +TX_VENDING_MACHINE EQUS "db $f5" +TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" +TX_PRIZE_VENDOR EQUS "db $f7" +TX_POKECENTER_PC EQUS "db $f9" +TX_PLAYERS_PC EQUS "db $fc" +TX_BILLS_PC EQUS "db $fd" +TX_POKECENTER_NURSE EQUS "db $ff" + ; Predef macro. add_predef: MACRO \1Predef:: @@ -263,14 +277,6 @@ tx_pre_jump: MACRO jp PrintPredefTextID ENDM -TX_SFX_KEY_ITEM: macro - db $11 -endm - -TX_CONGRATSSFX: macro - db $10 -endm - WALK EQU $FE STAY EQU $FF @@ -309,6 +315,10 @@ object: MACRO ENDC ENDM +StopAllMusic: macro + ld a, $ff + call PlaySound + endm ;1_channel EQU $00 ;2_channels EQU $40 diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 04d3ee60..e797f613 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -122,7 +122,7 @@ BillsHouseTextPointers: ; 1e834 (7:6834) dw BillsHouseText4 BillsHouseText4: ; 1e83c (7:683c) - db $fd + TX_BILLS_PC BillsHouseText1: ; 1e83d (7:683d) TX_ASM @@ -191,7 +191,9 @@ BillThankYouText: ; 1e8ba (7:68ba) SSTicketReceivedText: ; 1e8bf (7:68bf) TX_FAR _SSTicketReceivedText - db $11, $6, "@" + TX_SFX_KEY_ITEM + TX_BUTTON_SOUND + db "@" SSTicketNoRoomText: ; 1e8c6 (7:68c6) TX_FAR _SSTicketNoRoomText diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 9a6dcd6d..de9a8e8d 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -267,7 +267,8 @@ CeladonGameCornerText_48d9c: ; 48d9c (12:4d9c) Received10CoinsText: ; 48da1 (12:4da1) TX_FAR _Received10CoinsText - db $0B, "@" + TX_SFX_ITEM + db "@" CeladonGameCornerText_48da7: ; 48da7 (12:4da7) TX_FAR _CeladonGameCornerText_48da7 @@ -344,7 +345,8 @@ CeladonGameCornerText_48e26: ; 48e26 (12:4e26) Received20CoinsText: ; 48e2b (12:4e2b) TX_FAR _Received20CoinsText - db $0B, "@" + TX_SFX_ITEM + db "@" CeladonGameCornerText_48e31: ; 48e31 (12:4e31) TX_FAR _CeladonGameCornerText_48e31 @@ -395,7 +397,8 @@ CeladonGameCornerText_48e88: ; 48e88 (12:4e88) CeladonGameCornerText_48e8d: ; 48e8d (12:4e8d) TX_FAR _CeladonGameCornerText_48e8d - db $0B, "@" + TX_SFX_ITEM + db "@" CeladonGameCornerText_48e93: ; 48e93 (12:4e93) TX_FAR _CeladonGameCornerText_48e93 diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index d00fb0b5..1f3bcb64 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -139,48 +139,48 @@ CeladonMartRoofText_484ee: CeladonMartRoofText_484f3: TX_FAR _CeladonMartRoofText_484f3 - db $0d + TX_WAIT_BUTTON db "@" CeladonMartRoofText_484f9: TX_FAR _CeladonMartRoofText_484f9 - db $0b + TX_SFX_ITEM TX_FAR _CeladonMartRoofText_484fe - db $0d + TX_WAIT_BUTTON db "@" CeladonMartRoofText_48504: TX_FAR _CeladonMartRoofText_48504 - db $0d + TX_WAIT_BUTTON db "@" CeladonMartRoofText_4850a: TX_FAR _CeladonMartRoofText_4850a - db $0b + TX_SFX_ITEM TX_FAR _CeladonMartRoofText_4850f - db $0d + TX_WAIT_BUTTON db "@" CeladonMartRoofText_48515: TX_FAR _CeladonMartRoofText_48515 - db $0d + TX_WAIT_BUTTON db "@" ReceivedTM49Text: TX_FAR _ReceivedTM49Text - db $0b + TX_SFX_ITEM TX_FAR _CeladonMartRoofText_48520 - db $0d + TX_WAIT_BUTTON db "@" CeladonMartRoofText_48526: TX_FAR _CeladonMartRoofText_48526 - db $0d + TX_WAIT_BUTTON db "@" CeladonMartRoofText_4852c: TX_FAR _CeladonMartRoofText_4852c - db $0d + TX_WAIT_BUTTON db "@" CeladonMartRoofScript_PrintDrinksInBag: @@ -248,7 +248,7 @@ CeladonMartRoofText4: db "@" CeladonMartRoofText5: - db $f5 + TX_VENDING_MACHINE CeladonMartRoofText6: TX_FAR _CeladonMartRoofText6 diff --git a/scripts/celadonpokecenter.asm b/scripts/celadonpokecenter.asm index 024a4ec3..bd91af20 100755 --- a/scripts/celadonpokecenter.asm +++ b/scripts/celadonpokecenter.asm @@ -9,10 +9,10 @@ CeladonPokecenterTextPointers: dw CeladonTradeNurseText CeladonTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST CeladonHealNurseText: - db $ff + TX_POKECENTER_NURSE CeladonPokecenterText2: TX_FAR _CeladonPokecenterText2 diff --git a/scripts/celadonprizeroom.asm b/scripts/celadonprizeroom.asm index 2cfd01d0..980778fe 100755 --- a/scripts/celadonprizeroom.asm +++ b/scripts/celadonprizeroom.asm @@ -17,4 +17,4 @@ CeladonPrizeRoomText2: ; 49102 (12:5102) db "@" CeladonPrizeRoomText3: ; 49107 (12:5107) - db $f7 + TX_PRIZE_VENDOR diff --git a/scripts/ceruleanpokecenter.asm b/scripts/ceruleanpokecenter.asm index cb18da01..b758f497 100755 --- a/scripts/ceruleanpokecenter.asm +++ b/scripts/ceruleanpokecenter.asm @@ -9,10 +9,10 @@ CeruleanPokecenterTextPointers: dw CeruleanTradeNurseText CeruleanTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST CeruleanHealNurseText: - db $ff + TX_POKECENTER_NURSE CeruleanPokecenterText2: TX_FAR _CeruleanPokecenterText2 diff --git a/scripts/cinnabarpokecenter.asm b/scripts/cinnabarpokecenter.asm index 3835f3d6..2f6d5791 100755 --- a/scripts/cinnabarpokecenter.asm +++ b/scripts/cinnabarpokecenter.asm @@ -9,7 +9,7 @@ CinnabarPokecenterTextPointers: dw CinnabarTradeNurseText CinnabarHealNurseText: - db $ff + TX_POKECENTER_NURSE CinnabarPokecenterText2: TX_FAR _CinnabarPokecenterText2 @@ -20,4 +20,4 @@ CinnabarPokecenterText3: db "@" CinnabarTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/fuchsiapokecenter.asm b/scripts/fuchsiapokecenter.asm index d17e5810..a6111e84 100755 --- a/scripts/fuchsiapokecenter.asm +++ b/scripts/fuchsiapokecenter.asm @@ -9,7 +9,7 @@ FuchsiaPokecenterTextPointers: dw FuchsiaTradeNurseText FuchsiaHealNurseText: - db $ff + TX_POKECENTER_NURSE FuchsiaPokecenterText2: TX_FAR _FuchsiaPokecenterText1 @@ -20,4 +20,4 @@ FuchsiaPokecenterText3: db "@" FuchsiaTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index 35570f48..c26f6f0c 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -22,7 +22,7 @@ IndigoPlateauLobbyTextPointers: dw IndigoTradeNurseText IndigoHealNurseText: - db $ff + TX_POKECENTER_NURSE IndigoPlateauLobbyText2: TX_FAR _IndigoPlateauLobbyText2 @@ -33,4 +33,4 @@ IndigoPlateauLobbyText3: db "@" IndigoTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/lavenderpokecenter.asm b/scripts/lavenderpokecenter.asm index 27a95b43..61d0b887 100755 --- a/scripts/lavenderpokecenter.asm +++ b/scripts/lavenderpokecenter.asm @@ -9,10 +9,10 @@ LavenderPokecenterTextPointers: dw LavenderTradeNurseText LavenderTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST LavenderHealNurseText: - db $ff + TX_POKECENTER_NURSE LavenderPokecenterText2: TX_FAR _LavenderPokecenterText2 diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 9398d027..bea7a47d 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -9,7 +9,7 @@ PewterPokecenterTextPointers: dw PewterTradeNurseText PewterHealNurseText: - db $ff + TX_POKECENTER_NURSE PewterPokecenterText2: TX_FAR _PewterPokecenterText2 @@ -21,8 +21,7 @@ PewterJigglypuffText: ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, .Text call PrintText - ld a, $ff - call PlaySound + StopAllMusic ld c, 32 call DelayFrames ld hl, JigglypuffFacingDirections @@ -30,7 +29,7 @@ PewterJigglypuffText: ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections call CopyData - ld a, [wSpriteStateData1 + 3 * $10 + $2] + ld a, [Sprite03SpriteImageIdx] ld hl, wJigglypuffFacingDirections .findMatchingFacingDirectionLoop cp [hl] @@ -44,7 +43,7 @@ PewterJigglypuffText: pop hl .loop ld a, [hl] - ld [wSpriteStateData1 + 3 * $10 + $2], a + ld [Sprite03SpriteImageIdx], a ; rotate the array push hl @@ -82,4 +81,4 @@ JigglypuffFacingDirections: JigglypuffFacingDirectionsEnd: PewterTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/saffronpokecenter.asm b/scripts/saffronpokecenter.asm index b99ef629..82467215 100755 --- a/scripts/saffronpokecenter.asm +++ b/scripts/saffronpokecenter.asm @@ -9,7 +9,7 @@ SaffronPokecenterTextPointers: dw SaffronTradeNurseText SaffronHealNurseText: - db $ff + TX_POKECENTER_NURSE SaffronPokecenterText2: TX_FAR _SaffronPokecenterText2 @@ -20,4 +20,4 @@ SaffronPokecenterText3: db "@" SaffronTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/vermilionpokecenter.asm b/scripts/vermilionpokecenter.asm index 09c8a937..f70aed31 100755 --- a/scripts/vermilionpokecenter.asm +++ b/scripts/vermilionpokecenter.asm @@ -9,7 +9,7 @@ VermilionPokecenterTextPointers: dw VermilionTradeNurseText VermilionHealNurseText: - db $ff + TX_POKECENTER_NURSE VermilionPokecenterText2: TX_FAR _VermilionPokecenterText2 @@ -20,4 +20,4 @@ VermilionPokecenterText3: db "@" VermilionTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm index d178446a..904ff47f 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/viridianpokecenter.asm @@ -9,7 +9,7 @@ ViridianPokecenterTextPointers: dw ViridianTradeNurseText ViridianHealNurseText: - db $ff + TX_POKECENTER_NURSE ViridianPokeCenterText2: TX_FAR _ViridianPokeCenterText2 @@ -20,4 +20,4 @@ ViridianPokeCenterText3: db "@" ViridianTradeNurseText: - db $f6 + TX_CABLE_CLUB_RECEPTIONIST -- cgit v1.3.1-sl0p From cee4d559f999312837da7d69e2c6704e85c159d4 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 11 Jun 2016 17:11:05 -0700 Subject: crlf to lf --- .gitattributes | 18 + constants/event_macros.asm | 882 ++++++++++++++++++++++----------------------- 2 files changed, 459 insertions(+), 441 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..bc973be0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,18 @@ +# Auto detect text files and perform LF normalization +* text eol=lf + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.asm text + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.2bpp binary +*.1bpp binary +*.rle binary +*.tilecoll binary +*.bst binary +*.map binary +*.wav binary +*.blk binary +*.pic binary diff --git a/constants/event_macros.asm b/constants/event_macros.asm index 90a6a59b..20027209 100755 --- a/constants/event_macros.asm +++ b/constants/event_macros.asm @@ -1,441 +1,441 @@ -;\1 = event index -;\2 = return result in carry instead of zero flag -CheckEvent: MACRO -event_byte = ((\1) / 8) - ld a, [wEventFlags + event_byte] - - IF _NARG > 1 - IF ((\1) % 8) == 7 - add a - ELSE - REPT ((\1) % 8) + 1 - rrca - ENDR - ENDC - ELSE - bit (\1) % 8, a - ENDC - ENDM - -;\1 = event index -CheckEventReuseA: MACRO - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld a, [wEventFlags + event_byte] - ENDC - - bit (\1) % 8, a - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -CheckEventAfterBranchReuseA: MACRO -event_byte = ((\2) / 8) - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld a, [wEventFlags + event_byte] - ENDC - - bit (\1) % 8, a - ENDM - -;\1 = reg -;\2 = event index -;\3 = event index this event is relative to (optional, this is needed when there is a fixed flag address) -EventFlagBit: MACRO - IF _NARG > 2 - ld \1, ((\3) % 8) + ((\2) - (\3)) - ELSE - ld \1, (\2) % 8 - ENDC - ENDM - -;\1 = reg -;\2 = event index -EventFlagAddress: MACRO -event_byte = ((\2) / 8) - ld \1, wEventFlags + event_byte - ENDM - -;\1 = event index -CheckEventHL: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - bit (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckEventReuseHL: MACRO -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - bit (\1) % 8, [hl] - ENDM - -; dangerous, only use when HL is guaranteed to be the desired value -;\1 = event index -CheckEventForceReuseHL: MACRO -event_byte = ((\1) / 8) - bit (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -CheckEventAfterBranchReuseHL: MACRO -event_byte = ((\2) / 8) -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - bit (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckAndSetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - bit (\1) % 8, [hl] - set (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckAndResetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - bit (\1) % 8, [hl] - res (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckAndSetEventA: MACRO - ld a, [wEventFlags + ((\1) / 8)] - bit (\1) % 8, a - set (\1) % 8, a - ld [wEventFlags + ((\1) / 8)], a - ENDM - -;\1 = event index -CheckAndResetEventA: MACRO - ld a, [wEventFlags + ((\1) / 8)] - bit (\1) % 8, a - res (\1) % 8, a - ld [wEventFlags + ((\1) / 8)], a - ENDM - -;\1 = event index -SetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - set (\1) % 8, [hl] - ENDM - -;\1 = event index -SetEventReuseHL: MACRO - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - set (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -SetEventAfterBranchReuseHL: MACRO -event_byte = ((\2) / 8) -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - set (\1) % 8, [hl] - ENDM - -; dangerous, only use when HL is guaranteed to be the desired value -;\1 = event index -SetEventForceReuseHL: MACRO -event_byte = ((\1) / 8) - set (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index -;\3, \4, ... = additional (optional) event indices -SetEvents: MACRO - SetEvent \1 - rept (_NARG + -1) - SetEventReuseHL \2 - shift - endr - ENDM - -;\1 = event index -ResetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - res (\1) % 8, [hl] - ENDM - -;\1 = event index -ResetEventReuseHL: MACRO - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - res (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -ResetEventAfterBranchReuseHL: MACRO -event_byte = ((\2) / 8) -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - res (\1) % 8, [hl] - ENDM - -; dangerous, only use when HL is guaranteed to be the desired value -;\1 = event index -ResetEventForceReuseHL: MACRO -event_byte = ((\1) / 8) - res (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index -;\3 = event index (optional) -ResetEvents: MACRO - ResetEvent \1 - rept (_NARG + -1) - ResetEventReuseHL \2 - shift - endr - ENDM - -;\1 = event index -;\2 = number of bytes away from the base address (optional, for matching the ROM) -dbEventFlagBit: MACRO - IF _NARG > 1 - db ((\1) % 8) + ((\2) * 8) - ELSE - db ((\1) % 8) - ENDC - ENDM - -;\1 = event index -;\2 = number of bytes away from the base address (optional, for matching the ROM) -dwEventFlagAddress: MACRO - IF _NARG > 1 - dw wEventFlags + ((\1) / 8) - (\2) - ELSE - dw wEventFlags + ((\1) / 8) - ENDC - ENDM - -;\1 = start -;\2 = end -SetEventRange: MACRO -event_start_byte = ((\1) / 8) -event_end_byte = ((\2) / 8) - - IF event_end_byte < event_start_byte - FAIL "Incorrect argument order in SetEventRange." - ENDC - - IF event_start_byte == event_end_byte - ld a, [wEventFlags + event_start_byte] - or (1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8)) - ld [wEventFlags + event_start_byte], a - ELSE -event_fill_start = event_start_byte + 1 -event_fill_count = event_end_byte - event_start_byte - 1 - - IF ((\1) % 8) == 0 -event_fill_start = event_fill_start + -1 -event_fill_count = event_fill_count + 1 - ELSE - ld a, [wEventFlags + event_start_byte] - or $ff - ((1 << ((\1) % 8)) - 1) - ld [wEventFlags + event_start_byte], a - ENDC - - IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 - ENDC - - IF event_fill_count == 1 - ld hl, wEventFlags + event_fill_start - ld [hl], $ff - ENDC - - IF event_fill_count > 1 - ld a, $ff - ld hl, wEventFlags + event_fill_start - - REPT event_fill_count + -1 - ld [hli], a - ENDR - - ld [hl], a - ENDC - - IF ((\2) % 8) == 0 - ld hl, wEventFlags + event_end_byte - set 0, [hl] - ELSE - IF ((\2) % 8) != 7 - ld a, [wEventFlags + event_end_byte] - or (1 << (((\2) % 8) + 1)) - 1 - ld [wEventFlags + event_end_byte], a - ENDC - ENDC - ENDC - ENDM - -;\1 = start -;\2 = end -;\3 = assume a is 0 if present -ResetEventRange: MACRO -event_start_byte = ((\1) / 8) -event_end_byte = ((\2) / 8) - - IF event_end_byte < event_start_byte - FAIL "Incorrect argument order in ResetEventRange." - ENDC - - IF event_start_byte == event_end_byte - ld a, [wEventFlags + event_start_byte] - and ~((1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8))) & $ff - ld [wEventFlags + event_start_byte], a - ELSE -event_fill_start = event_start_byte + 1 -event_fill_count = event_end_byte - event_start_byte - 1 - - IF ((\1) % 8) == 0 -event_fill_start = event_fill_start + -1 -event_fill_count = event_fill_count + 1 - ELSE - ld a, [wEventFlags + event_start_byte] - and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff - ld [wEventFlags + event_start_byte], a - ENDC - - IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 - ENDC - - IF event_fill_count == 1 - ld hl, wEventFlags + event_fill_start - ld [hl], 0 - ENDC - - IF event_fill_count > 1 - ld hl, wEventFlags + event_fill_start - - ; force xor a if we just to wrote to it above - IF (_NARG < 3) || (((\1) % 8) != 0) - xor a - ENDC - - REPT event_fill_count + -1 - ld [hli], a - ENDR - - ld [hl], a - ENDC - - IF ((\2) % 8) == 0 - ld hl, wEventFlags + event_end_byte - res 0, [hl] - ELSE - IF ((\2) % 8) != 7 - ld a, [wEventFlags + event_end_byte] - and ~((1 << (((\2) % 8) + 1)) - 1) & $ff - ld [wEventFlags + event_end_byte], a - ENDC - ENDC - ENDC - ENDM - -; returns whether both events are set in Z flag -; This is counter-intuitive because the other event checks set the Z flag when -; the event is not set, but this sets the Z flag when the event is set. -;\1 = event index 1 -;\2 = event index 2 -;\3 = try to reuse a (optional) -CheckBothEventsSet: MACRO - IF ((\1) / 8) == ((\2) / 8) - IF (_NARG < 3) || (((\1) / 8) != event_byte) -event_byte = ((\1) / 8) - ld a, [wEventFlags + ((\1) / 8)] - ENDC - and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - ELSE - ; This case doesn't happen in the original ROM. - IF ((\1) % 8) == ((\2) % 8) - push hl - ld a, [wEventFlags + ((\1) / 8)] - ld hl, wEventFlags + ((\2) / 8) - and [hl] - cpl - bit ((\1) % 8), a - pop hl - ELSE - push bc - ld a, [wEventFlags + ((\1) / 8)] - and (1 << ((\1) % 8)) - ld b, a - ld a, [wEventFlags + ((\2) / 8)] - and (1 << ((\2) % 8)) - or b - cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - pop bc - ENDC - ENDC - ENDM - -; returns the complement of whether either event is set in Z flag -;\1 = event index 1 -;\2 = event index 2 -CheckEitherEventSet: MACRO - IF ((\1) / 8) == ((\2) / 8) - ld a, [wEventFlags + ((\1) / 8)] - and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - ELSE - ; This case doesn't happen in the original ROM. - IF ((\1) % 8) == ((\2) % 8) - push hl - ld a, [wEventFlags + ((\1) / 8)] - ld hl, wEventFlags + ((\2) / 8) - or [hl] - bit ((\1) % 8), a - pop hl - ELSE - push bc - ld a, [wEventFlags + ((\1) / 8)] - and (1 << ((\1) % 8)) - ld b, a - ld a, [wEventFlags + ((\2) / 8)] - and (1 << ((\2) % 8)) - or b - pop bc - ENDC - ENDC - ENDM - -; for handling fixed event bits when events are inserted/removed -;\1 = event index -;\2 = fixed flag bit -AdjustEventBit: MACRO - IF ((\1) % 8) != (\2) - add ((\1) % 8) - (\2) - ENDC - ENDM +;\1 = event index +;\2 = return result in carry instead of zero flag +CheckEvent: MACRO +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + + IF _NARG > 1 + IF ((\1) % 8) == 7 + add a + ELSE + REPT ((\1) % 8) + 1 + rrca + ENDR + ENDC + ELSE + bit (\1) % 8, a + ENDC + ENDM + +;\1 = event index +CheckEventReuseA: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + ENDC + + bit (\1) % 8, a + ENDM + +;\1 = event index +;\2 = event index of the last event used before the branch +CheckEventAfterBranchReuseA: MACRO +event_byte = ((\2) / 8) + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + ENDC + + bit (\1) % 8, a + ENDM + +;\1 = reg +;\2 = event index +;\3 = event index this event is relative to (optional, this is needed when there is a fixed flag address) +EventFlagBit: MACRO + IF _NARG > 2 + ld \1, ((\3) % 8) + ((\2) - (\3)) + ELSE + ld \1, (\2) % 8 + ENDC + ENDM + +;\1 = reg +;\2 = event index +EventFlagAddress: MACRO +event_byte = ((\2) / 8) + ld \1, wEventFlags + event_byte + ENDM + +;\1 = event index +CheckEventHL: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + bit (\1) % 8, [hl] + ENDM + +;\1 = event index +CheckEventReuseHL: MACRO +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + bit (\1) % 8, [hl] + ENDM + +; dangerous, only use when HL is guaranteed to be the desired value +;\1 = event index +CheckEventForceReuseHL: MACRO +event_byte = ((\1) / 8) + bit (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index of the last event used before the branch +CheckEventAfterBranchReuseHL: MACRO +event_byte = ((\2) / 8) +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + bit (\1) % 8, [hl] + ENDM + +;\1 = event index +CheckAndSetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + bit (\1) % 8, [hl] + set (\1) % 8, [hl] + ENDM + +;\1 = event index +CheckAndResetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + bit (\1) % 8, [hl] + res (\1) % 8, [hl] + ENDM + +;\1 = event index +CheckAndSetEventA: MACRO + ld a, [wEventFlags + ((\1) / 8)] + bit (\1) % 8, a + set (\1) % 8, a + ld [wEventFlags + ((\1) / 8)], a + ENDM + +;\1 = event index +CheckAndResetEventA: MACRO + ld a, [wEventFlags + ((\1) / 8)] + bit (\1) % 8, a + res (\1) % 8, a + ld [wEventFlags + ((\1) / 8)], a + ENDM + +;\1 = event index +SetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + set (\1) % 8, [hl] + ENDM + +;\1 = event index +SetEventReuseHL: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + set (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index of the last event used before the branch +SetEventAfterBranchReuseHL: MACRO +event_byte = ((\2) / 8) +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + set (\1) % 8, [hl] + ENDM + +; dangerous, only use when HL is guaranteed to be the desired value +;\1 = event index +SetEventForceReuseHL: MACRO +event_byte = ((\1) / 8) + set (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index +;\3, \4, ... = additional (optional) event indices +SetEvents: MACRO + SetEvent \1 + rept (_NARG + -1) + SetEventReuseHL \2 + shift + endr + ENDM + +;\1 = event index +ResetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + res (\1) % 8, [hl] + ENDM + +;\1 = event index +ResetEventReuseHL: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + res (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index of the last event used before the branch +ResetEventAfterBranchReuseHL: MACRO +event_byte = ((\2) / 8) +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + res (\1) % 8, [hl] + ENDM + +; dangerous, only use when HL is guaranteed to be the desired value +;\1 = event index +ResetEventForceReuseHL: MACRO +event_byte = ((\1) / 8) + res (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index +;\3 = event index (optional) +ResetEvents: MACRO + ResetEvent \1 + rept (_NARG + -1) + ResetEventReuseHL \2 + shift + endr + ENDM + +;\1 = event index +;\2 = number of bytes away from the base address (optional, for matching the ROM) +dbEventFlagBit: MACRO + IF _NARG > 1 + db ((\1) % 8) + ((\2) * 8) + ELSE + db ((\1) % 8) + ENDC + ENDM + +;\1 = event index +;\2 = number of bytes away from the base address (optional, for matching the ROM) +dwEventFlagAddress: MACRO + IF _NARG > 1 + dw wEventFlags + ((\1) / 8) - (\2) + ELSE + dw wEventFlags + ((\1) / 8) + ENDC + ENDM + +;\1 = start +;\2 = end +SetEventRange: MACRO +event_start_byte = ((\1) / 8) +event_end_byte = ((\2) / 8) + + IF event_end_byte < event_start_byte + FAIL "Incorrect argument order in SetEventRange." + ENDC + + IF event_start_byte == event_end_byte + ld a, [wEventFlags + event_start_byte] + or (1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8)) + ld [wEventFlags + event_start_byte], a + ELSE +event_fill_start = event_start_byte + 1 +event_fill_count = event_end_byte - event_start_byte - 1 + + IF ((\1) % 8) == 0 +event_fill_start = event_fill_start + -1 +event_fill_count = event_fill_count + 1 + ELSE + ld a, [wEventFlags + event_start_byte] + or $ff - ((1 << ((\1) % 8)) - 1) + ld [wEventFlags + event_start_byte], a + ENDC + + IF ((\2) % 8) == 7 +event_fill_count = event_fill_count + 1 + ENDC + + IF event_fill_count == 1 + ld hl, wEventFlags + event_fill_start + ld [hl], $ff + ENDC + + IF event_fill_count > 1 + ld a, $ff + ld hl, wEventFlags + event_fill_start + + REPT event_fill_count + -1 + ld [hli], a + ENDR + + ld [hl], a + ENDC + + IF ((\2) % 8) == 0 + ld hl, wEventFlags + event_end_byte + set 0, [hl] + ELSE + IF ((\2) % 8) != 7 + ld a, [wEventFlags + event_end_byte] + or (1 << (((\2) % 8) + 1)) - 1 + ld [wEventFlags + event_end_byte], a + ENDC + ENDC + ENDC + ENDM + +;\1 = start +;\2 = end +;\3 = assume a is 0 if present +ResetEventRange: MACRO +event_start_byte = ((\1) / 8) +event_end_byte = ((\2) / 8) + + IF event_end_byte < event_start_byte + FAIL "Incorrect argument order in ResetEventRange." + ENDC + + IF event_start_byte == event_end_byte + ld a, [wEventFlags + event_start_byte] + and ~((1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8))) & $ff + ld [wEventFlags + event_start_byte], a + ELSE +event_fill_start = event_start_byte + 1 +event_fill_count = event_end_byte - event_start_byte - 1 + + IF ((\1) % 8) == 0 +event_fill_start = event_fill_start + -1 +event_fill_count = event_fill_count + 1 + ELSE + ld a, [wEventFlags + event_start_byte] + and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff + ld [wEventFlags + event_start_byte], a + ENDC + + IF ((\2) % 8) == 7 +event_fill_count = event_fill_count + 1 + ENDC + + IF event_fill_count == 1 + ld hl, wEventFlags + event_fill_start + ld [hl], 0 + ENDC + + IF event_fill_count > 1 + ld hl, wEventFlags + event_fill_start + + ; force xor a if we just to wrote to it above + IF (_NARG < 3) || (((\1) % 8) != 0) + xor a + ENDC + + REPT event_fill_count + -1 + ld [hli], a + ENDR + + ld [hl], a + ENDC + + IF ((\2) % 8) == 0 + ld hl, wEventFlags + event_end_byte + res 0, [hl] + ELSE + IF ((\2) % 8) != 7 + ld a, [wEventFlags + event_end_byte] + and ~((1 << (((\2) % 8) + 1)) - 1) & $ff + ld [wEventFlags + event_end_byte], a + ENDC + ENDC + ENDC + ENDM + +; returns whether both events are set in Z flag +; This is counter-intuitive because the other event checks set the Z flag when +; the event is not set, but this sets the Z flag when the event is set. +;\1 = event index 1 +;\2 = event index 2 +;\3 = try to reuse a (optional) +CheckBothEventsSet: MACRO + IF ((\1) / 8) == ((\2) / 8) + IF (_NARG < 3) || (((\1) / 8) != event_byte) +event_byte = ((\1) / 8) + ld a, [wEventFlags + ((\1) / 8)] + ENDC + and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + ELSE + ; This case doesn't happen in the original ROM. + IF ((\1) % 8) == ((\2) % 8) + push hl + ld a, [wEventFlags + ((\1) / 8)] + ld hl, wEventFlags + ((\2) / 8) + and [hl] + cpl + bit ((\1) % 8), a + pop hl + ELSE + push bc + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) + ld b, a + ld a, [wEventFlags + ((\2) / 8)] + and (1 << ((\2) % 8)) + or b + cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + pop bc + ENDC + ENDC + ENDM + +; returns the complement of whether either event is set in Z flag +;\1 = event index 1 +;\2 = event index 2 +CheckEitherEventSet: MACRO + IF ((\1) / 8) == ((\2) / 8) + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + ELSE + ; This case doesn't happen in the original ROM. + IF ((\1) % 8) == ((\2) % 8) + push hl + ld a, [wEventFlags + ((\1) / 8)] + ld hl, wEventFlags + ((\2) / 8) + or [hl] + bit ((\1) % 8), a + pop hl + ELSE + push bc + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) + ld b, a + ld a, [wEventFlags + ((\2) / 8)] + and (1 << ((\2) % 8)) + or b + pop bc + ENDC + ENDC + ENDM + +; for handling fixed event bits when events are inserted/removed +;\1 = event index +;\2 = fixed flag bit +AdjustEventBit: MACRO + IF ((\1) % 8) != (\2) + add ((\1) % 8) - (\2) + ENDC + ENDM -- cgit v1.3.1-sl0p From 7f34e28f242ee4d0caba0bd96b040811dcb86c50 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 11 Jun 2016 17:24:04 -0700 Subject: remove address comments --- audio.asm | 12 +- audio/engine_2.asm | 98 +-- audio/engine_3.asm | 96 +-- audio/headers/musicheaders1.asm | 40 +- audio/headers/musicheaders2.asm | 14 +- audio/headers/musicheaders3.asm | 36 +- audio/headers/sfxheaders1.asm | 190 ++--- audio/headers/sfxheaders2.asm | 238 +++--- audio/headers/sfxheaders3.asm | 206 +++--- audio/music/bikeriding.asm | 8 +- audio/music/celadon.asm | 6 +- audio/music/cinnabar.asm | 6 +- audio/music/cinnabarmansion.asm | 8 +- audio/music/cities1.asm | 8 +- audio/music/cities2.asm | 6 +- audio/music/credits.asm | 6 +- audio/music/defeatedgymleader.asm | 6 +- audio/music/defeatedtrainer.asm | 6 +- audio/music/defeatedwildmon.asm | 6 +- audio/music/dungeon1.asm | 8 +- audio/music/dungeon2.asm | 8 +- audio/music/dungeon3.asm | 8 +- audio/music/finalbattle.asm | 6 +- audio/music/gamecorner.asm | 6 +- audio/music/gym.asm | 6 +- audio/music/gymleaderbattle.asm | 6 +- audio/music/halloffame.asm | 6 +- audio/music/indigoplateau.asm | 8 +- audio/music/introbattle.asm | 8 +- audio/music/jigglypuffsong.asm | 4 +- audio/music/lavender.asm | 8 +- audio/music/meeteviltrainer.asm | 6 +- audio/music/meetfemaletrainer.asm | 6 +- audio/music/meetmaletrainer.asm | 6 +- audio/music/meetprofoak.asm | 6 +- audio/music/meetrival.asm | 6 +- audio/music/museumguy.asm | 8 +- audio/music/oakslab.asm | 6 +- audio/music/pallettown.asm | 6 +- audio/music/pkmnhealed.asm | 6 +- audio/music/pokecenter.asm | 6 +- audio/music/pokemontower.asm | 6 +- audio/music/routes1.asm | 8 +- audio/music/routes2.asm | 8 +- audio/music/routes3.asm | 8 +- audio/music/routes4.asm | 8 +- audio/music/safarizone.asm | 6 +- audio/music/silphco.asm | 6 +- audio/music/ssanne.asm | 6 +- audio/music/surfing.asm | 6 +- audio/music/titlescreen.asm | 8 +- audio/music/trainerbattle.asm | 6 +- audio/music/unusedsong.asm | 4 +- audio/music/vermilion.asm | 8 +- audio/music/wildbattle.asm | 6 +- audio/music/yellow/meetjessiejames.asm | 6 +- audio/music/yellow/surfingpikachu.asm | 6 +- audio/music/yellow/yellowintro.asm | 6 +- audio/music/yellow/yellowunusedsong.asm | 8 +- audio/sfx/59_1.asm | 4 +- audio/sfx/59_3.asm | 4 +- audio/sfx/arrow_tiles_1.asm | 2 +- audio/sfx/arrow_tiles_3.asm | 2 +- audio/sfx/ball_poof.asm | 4 +- audio/sfx/ball_toss.asm | 4 +- audio/sfx/battle_09.asm | 2 +- audio/sfx/battle_0b.asm | 2 +- audio/sfx/battle_0c.asm | 2 +- audio/sfx/battle_0d.asm | 2 +- audio/sfx/battle_0e.asm | 2 +- audio/sfx/battle_0f.asm | 2 +- audio/sfx/battle_12.asm | 2 +- audio/sfx/battle_13.asm | 2 +- audio/sfx/battle_14.asm | 2 +- audio/sfx/battle_16.asm | 2 +- audio/sfx/battle_17.asm | 2 +- audio/sfx/battle_18.asm | 2 +- audio/sfx/battle_19.asm | 2 +- audio/sfx/battle_1b.asm | 2 +- audio/sfx/battle_1c.asm | 2 +- audio/sfx/battle_1e.asm | 4 +- audio/sfx/battle_20.asm | 2 +- audio/sfx/battle_21.asm | 2 +- audio/sfx/battle_22.asm | 2 +- audio/sfx/battle_23.asm | 2 +- audio/sfx/battle_24.asm | 4 +- audio/sfx/battle_25.asm | 2 +- audio/sfx/battle_26.asm | 2 +- audio/sfx/battle_27.asm | 6 +- audio/sfx/battle_28.asm | 6 +- audio/sfx/battle_29.asm | 4 +- audio/sfx/battle_2a.asm | 6 +- audio/sfx/battle_2b.asm | 4 +- audio/sfx/battle_2c.asm | 6 +- audio/sfx/battle_2e.asm | 6 +- audio/sfx/battle_2f.asm | 6 +- audio/sfx/battle_31.asm | 4 +- audio/sfx/battle_32.asm | 4 +- audio/sfx/battle_33.asm | 4 +- audio/sfx/battle_34.asm | 6 +- audio/sfx/battle_35.asm | 4 +- audio/sfx/battle_36.asm | 6 +- audio/sfx/caught_mon.asm | 6 +- audio/sfx/collision_1.asm | 2 +- audio/sfx/collision_3.asm | 2 +- audio/sfx/cry00_1.asm | 6 +- audio/sfx/cry00_2.asm | 6 +- audio/sfx/cry00_3.asm | 6 +- audio/sfx/cry01_1.asm | 6 +- audio/sfx/cry01_2.asm | 6 +- audio/sfx/cry01_3.asm | 6 +- audio/sfx/cry02_1.asm | 6 +- audio/sfx/cry02_2.asm | 6 +- audio/sfx/cry02_3.asm | 6 +- audio/sfx/cry03_1.asm | 6 +- audio/sfx/cry03_2.asm | 6 +- audio/sfx/cry03_3.asm | 6 +- audio/sfx/cry04_1.asm | 6 +- audio/sfx/cry04_2.asm | 6 +- audio/sfx/cry04_3.asm | 6 +- audio/sfx/cry05_1.asm | 6 +- audio/sfx/cry05_2.asm | 6 +- audio/sfx/cry05_3.asm | 6 +- audio/sfx/cry06_1.asm | 6 +- audio/sfx/cry06_2.asm | 6 +- audio/sfx/cry06_3.asm | 6 +- audio/sfx/cry07_1.asm | 6 +- audio/sfx/cry07_2.asm | 6 +- audio/sfx/cry07_3.asm | 6 +- audio/sfx/cry08_1.asm | 6 +- audio/sfx/cry08_2.asm | 6 +- audio/sfx/cry08_3.asm | 6 +- audio/sfx/cry09_1.asm | 6 +- audio/sfx/cry09_2.asm | 6 +- audio/sfx/cry09_3.asm | 6 +- audio/sfx/cry0a_1.asm | 6 +- audio/sfx/cry0a_2.asm | 6 +- audio/sfx/cry0a_3.asm | 6 +- audio/sfx/cry0b_1.asm | 6 +- audio/sfx/cry0b_2.asm | 6 +- audio/sfx/cry0b_3.asm | 6 +- audio/sfx/cry0c_1.asm | 6 +- audio/sfx/cry0c_2.asm | 6 +- audio/sfx/cry0c_3.asm | 6 +- audio/sfx/cry0d_1.asm | 6 +- audio/sfx/cry0d_2.asm | 6 +- audio/sfx/cry0d_3.asm | 6 +- audio/sfx/cry0e_1.asm | 6 +- audio/sfx/cry0e_2.asm | 6 +- audio/sfx/cry0e_3.asm | 6 +- audio/sfx/cry0f_1.asm | 6 +- audio/sfx/cry0f_2.asm | 6 +- audio/sfx/cry0f_3.asm | 6 +- audio/sfx/cry10_1.asm | 6 +- audio/sfx/cry10_2.asm | 6 +- audio/sfx/cry10_3.asm | 6 +- audio/sfx/cry11_1.asm | 6 +- audio/sfx/cry11_2.asm | 6 +- audio/sfx/cry11_3.asm | 6 +- audio/sfx/cry12_1.asm | 6 +- audio/sfx/cry12_2.asm | 6 +- audio/sfx/cry12_3.asm | 6 +- audio/sfx/cry13_1.asm | 6 +- audio/sfx/cry13_2.asm | 6 +- audio/sfx/cry13_3.asm | 6 +- audio/sfx/cry14_1.asm | 6 +- audio/sfx/cry14_2.asm | 6 +- audio/sfx/cry14_3.asm | 6 +- audio/sfx/cry15_1.asm | 6 +- audio/sfx/cry15_2.asm | 6 +- audio/sfx/cry15_3.asm | 6 +- audio/sfx/cry16_1.asm | 6 +- audio/sfx/cry16_2.asm | 6 +- audio/sfx/cry16_3.asm | 6 +- audio/sfx/cry17_1.asm | 6 +- audio/sfx/cry17_2.asm | 6 +- audio/sfx/cry17_3.asm | 6 +- audio/sfx/cry18_1.asm | 6 +- audio/sfx/cry18_2.asm | 6 +- audio/sfx/cry18_3.asm | 6 +- audio/sfx/cry19_1.asm | 6 +- audio/sfx/cry19_2.asm | 6 +- audio/sfx/cry19_3.asm | 6 +- audio/sfx/cry1a_1.asm | 6 +- audio/sfx/cry1a_2.asm | 6 +- audio/sfx/cry1a_3.asm | 6 +- audio/sfx/cry1b_1.asm | 6 +- audio/sfx/cry1b_2.asm | 6 +- audio/sfx/cry1b_3.asm | 6 +- audio/sfx/cry1c_1.asm | 6 +- audio/sfx/cry1c_2.asm | 6 +- audio/sfx/cry1c_3.asm | 6 +- audio/sfx/cry1d_1.asm | 6 +- audio/sfx/cry1d_2.asm | 6 +- audio/sfx/cry1d_3.asm | 6 +- audio/sfx/cry1e_1.asm | 6 +- audio/sfx/cry1e_2.asm | 6 +- audio/sfx/cry1e_3.asm | 6 +- audio/sfx/cry1f_1.asm | 6 +- audio/sfx/cry1f_2.asm | 6 +- audio/sfx/cry1f_3.asm | 6 +- audio/sfx/cry20_1.asm | 6 +- audio/sfx/cry20_2.asm | 6 +- audio/sfx/cry20_3.asm | 6 +- audio/sfx/cry21_1.asm | 6 +- audio/sfx/cry21_2.asm | 6 +- audio/sfx/cry21_3.asm | 6 +- audio/sfx/cry22_1.asm | 6 +- audio/sfx/cry22_2.asm | 6 +- audio/sfx/cry22_3.asm | 6 +- audio/sfx/cry23_1.asm | 6 +- audio/sfx/cry23_2.asm | 6 +- audio/sfx/cry23_3.asm | 6 +- audio/sfx/cry24_1.asm | 6 +- audio/sfx/cry24_2.asm | 6 +- audio/sfx/cry24_3.asm | 6 +- audio/sfx/cry25_1.asm | 6 +- audio/sfx/cry25_2.asm | 6 +- audio/sfx/cry25_3.asm | 6 +- audio/sfx/cut_1.asm | 2 +- audio/sfx/cut_3.asm | 2 +- audio/sfx/cymbal1_1.asm | 2 +- audio/sfx/cymbal1_2.asm | 2 +- audio/sfx/cymbal1_3.asm | 2 +- audio/sfx/cymbal2_1.asm | 2 +- audio/sfx/cymbal2_2.asm | 2 +- audio/sfx/cymbal2_3.asm | 2 +- audio/sfx/cymbal3_1.asm | 2 +- audio/sfx/cymbal3_2.asm | 2 +- audio/sfx/cymbal3_3.asm | 2 +- audio/sfx/damage.asm | 2 +- audio/sfx/denied_1.asm | 4 +- audio/sfx/denied_3.asm | 4 +- audio/sfx/dex_page_added.asm | 4 +- audio/sfx/doubleslap.asm | 2 +- audio/sfx/enter_pc_1.asm | 2 +- audio/sfx/enter_pc_3.asm | 2 +- audio/sfx/faint_fall.asm | 2 +- audio/sfx/faint_thud.asm | 4 +- audio/sfx/fly_1.asm | 2 +- audio/sfx/fly_3.asm | 2 +- audio/sfx/get_item1_1.asm | 6 +- audio/sfx/get_item1_3.asm | 6 +- audio/sfx/get_item2_1.asm | 6 +- audio/sfx/get_item2_2.asm | 6 +- audio/sfx/get_item2_3.asm | 6 +- audio/sfx/get_key_item_1.asm | 6 +- audio/sfx/get_key_item_3.asm | 6 +- audio/sfx/go_inside_1.asm | 2 +- audio/sfx/go_inside_3.asm | 2 +- audio/sfx/go_outside_1.asm | 2 +- audio/sfx/go_outside_3.asm | 2 +- audio/sfx/heal_ailment_1.asm | 2 +- audio/sfx/heal_ailment_2.asm | 2 +- audio/sfx/heal_ailment_3.asm | 2 +- audio/sfx/heal_hp_1.asm | 2 +- audio/sfx/heal_hp_2.asm | 2 +- audio/sfx/heal_hp_3.asm | 2 +- audio/sfx/healing_machine_1.asm | 2 +- audio/sfx/healing_machine_3.asm | 2 +- audio/sfx/horn_drill.asm | 2 +- audio/sfx/intro_crash.asm | 2 +- audio/sfx/intro_hip.asm | 2 +- audio/sfx/intro_hop.asm | 2 +- audio/sfx/intro_lunge.asm | 2 +- audio/sfx/intro_raise.asm | 2 +- audio/sfx/intro_whoosh.asm | 2 +- audio/sfx/ledge_1.asm | 2 +- audio/sfx/ledge_3.asm | 2 +- audio/sfx/level_up.asm | 6 +- audio/sfx/muted_snare1_1.asm | 2 +- audio/sfx/muted_snare1_2.asm | 2 +- audio/sfx/muted_snare1_3.asm | 2 +- audio/sfx/muted_snare2_1.asm | 2 +- audio/sfx/muted_snare2_2.asm | 2 +- audio/sfx/muted_snare2_3.asm | 2 +- audio/sfx/muted_snare3_1.asm | 2 +- audio/sfx/muted_snare3_2.asm | 2 +- audio/sfx/muted_snare3_3.asm | 2 +- audio/sfx/muted_snare4_1.asm | 2 +- audio/sfx/muted_snare4_2.asm | 2 +- audio/sfx/muted_snare4_3.asm | 2 +- audio/sfx/not_very_effective.asm | 2 +- audio/sfx/peck.asm | 2 +- audio/sfx/poisoned_1.asm | 2 +- audio/sfx/poisoned_3.asm | 2 +- audio/sfx/pokedex_rating_1.asm | 6 +- audio/sfx/pokedex_rating_3.asm | 6 +- audio/sfx/pokeflute.asm | 2 +- audio/sfx/pokeflute_ch1_ch2.asm | 4 +- audio/sfx/pokeflute_ch3.asm | 2 +- audio/sfx/pound.asm | 2 +- audio/sfx/press_ab_1.asm | 2 +- audio/sfx/press_ab_2.asm | 2 +- audio/sfx/press_ab_3.asm | 2 +- audio/sfx/psybeam.asm | 6 +- audio/sfx/psychic_m.asm | 6 +- audio/sfx/purchase_1.asm | 4 +- audio/sfx/purchase_3.asm | 4 +- audio/sfx/push_boulder_1.asm | 2 +- audio/sfx/push_boulder_3.asm | 2 +- audio/sfx/run.asm | 2 +- audio/sfx/safari_zone_pa.asm | 2 +- audio/sfx/save_1.asm | 4 +- audio/sfx/save_3.asm | 4 +- audio/sfx/shooting_star.asm | 2 +- audio/sfx/shrink_1.asm | 2 +- audio/sfx/shrink_3.asm | 2 +- audio/sfx/silph_scope.asm | 2 +- audio/sfx/slots_new_spin.asm | 4 +- audio/sfx/slots_reward.asm | 2 +- audio/sfx/slots_stop_wheel.asm | 2 +- audio/sfx/snare1_1.asm | 2 +- audio/sfx/snare1_2.asm | 2 +- audio/sfx/snare1_3.asm | 2 +- audio/sfx/snare2_1.asm | 2 +- audio/sfx/snare2_2.asm | 2 +- audio/sfx/snare2_3.asm | 2 +- audio/sfx/snare3_1.asm | 2 +- audio/sfx/snare3_2.asm | 2 +- audio/sfx/snare3_3.asm | 2 +- audio/sfx/snare4_1.asm | 2 +- audio/sfx/snare4_2.asm | 2 +- audio/sfx/snare4_3.asm | 2 +- audio/sfx/snare5_1.asm | 2 +- audio/sfx/snare5_2.asm | 2 +- audio/sfx/snare5_3.asm | 2 +- audio/sfx/snare6_1.asm | 2 +- audio/sfx/snare6_2.asm | 2 +- audio/sfx/snare6_3.asm | 2 +- audio/sfx/snare7_1.asm | 2 +- audio/sfx/snare7_2.asm | 2 +- audio/sfx/snare7_3.asm | 2 +- audio/sfx/snare8_1.asm | 2 +- audio/sfx/snare8_2.asm | 2 +- audio/sfx/snare8_3.asm | 2 +- audio/sfx/snare9_1.asm | 2 +- audio/sfx/snare9_2.asm | 2 +- audio/sfx/snare9_3.asm | 2 +- audio/sfx/ss_anne_horn_1.asm | 4 +- audio/sfx/ss_anne_horn_3.asm | 4 +- audio/sfx/start_menu_1.asm | 2 +- audio/sfx/start_menu_2.asm | 2 +- audio/sfx/start_menu_3.asm | 2 +- audio/sfx/super_effective.asm | 2 +- audio/sfx/swap_1.asm | 4 +- audio/sfx/swap_3.asm | 4 +- audio/sfx/switch_1.asm | 2 +- audio/sfx/switch_3.asm | 2 +- audio/sfx/teleport_enter1_1.asm | 2 +- audio/sfx/teleport_enter1_3.asm | 2 +- audio/sfx/teleport_enter2_1.asm | 2 +- audio/sfx/teleport_enter2_3.asm | 2 +- audio/sfx/teleport_exit1_1.asm | 2 +- audio/sfx/teleport_exit1_3.asm | 2 +- audio/sfx/teleport_exit2_1.asm | 2 +- audio/sfx/teleport_exit2_3.asm | 2 +- audio/sfx/tink_1.asm | 2 +- audio/sfx/tink_2.asm | 2 +- audio/sfx/tink_3.asm | 2 +- audio/sfx/trade_machine_1.asm | 2 +- audio/sfx/trade_machine_3.asm | 2 +- audio/sfx/triangle1_1.asm | 2 +- audio/sfx/triangle1_2.asm | 2 +- audio/sfx/triangle1_3.asm | 2 +- audio/sfx/triangle2_1.asm | 2 +- audio/sfx/triangle2_2.asm | 2 +- audio/sfx/triangle2_3.asm | 2 +- audio/sfx/triangle3_1.asm | 2 +- audio/sfx/triangle3_2.asm | 2 +- audio/sfx/triangle3_3.asm | 2 +- audio/sfx/turn_off_pc_1.asm | 2 +- audio/sfx/turn_off_pc_3.asm | 2 +- audio/sfx/turn_on_pc_1.asm | 2 +- audio/sfx/turn_on_pc_3.asm | 2 +- audio/sfx/unused2_2.asm | 6 +- audio/sfx/unused_1.asm | 6 +- audio/sfx/unused_2.asm | 6 +- audio/sfx/unused_3.asm | 6 +- audio/sfx/vine_whip.asm | 2 +- audio/sfx/withdraw_deposit_1.asm | 2 +- audio/sfx/withdraw_deposit_3.asm | 2 +- data/animations.asm | 816 ++++++++++----------- data/bike_riding_tilesets.asm | 2 +- data/credit_mons.asm | 2 +- data/credits_order.asm | 2 +- data/cries.asm | 2 +- data/dungeon_tilesets.asm | 2 +- data/evos_moves.asm | 382 +++++----- data/facing.asm | 18 +- data/force_bike_surf.asm | 2 +- data/good_rod.asm | 2 +- data/hidden_coins.asm | 2 +- data/hidden_item_coords.asm | 2 +- data/hidden_objects.asm | 174 ++--- data/hide_show_data.asm | 152 ++-- data/item_prices.asm | 2 +- data/key_items.asm | 2 +- data/mapHeaders/celadoncity.asm | 2 +- data/mapHeaders/gary.asm | 2 +- data/mapHeaders/pallettown.asm | 2 +- data/mapHeaders/redshouse1f.asm | 2 +- data/mapHeaders/redshouse2f.asm | 2 +- data/mapHeaders/route15gateupstairs.asm | 2 +- data/mapHeaders/route2.asm | 2 +- .../undergroundpathentranceroute7copy.asm | 2 +- data/mapObjects/blueshouse.asm | 2 +- data/mapObjects/redshouse1f.asm | 2 +- data/mapObjects/route15gateupstairs.asm | 2 +- .../undergroundpathentranceroute7copy.asm | 2 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- data/map_songs.asm | 2 +- data/mon_palettes.asm | 2 +- data/mon_party_sprites.asm | 2 +- data/pokedex_entries.asm | 306 ++++---- data/pokedex_order.asm | 2 +- data/prize_mon_levels.asm | 2 +- data/prizes.asm | 16 +- data/sgb_border.asm | 4 +- data/sgb_packets.asm | 20 +- data/slot_machine_wheels.asm | 6 +- data/special_warps.asm | 42 +- data/sprite_sets.asm | 8 +- data/super_palettes.asm | 2 +- data/super_rod.asm | 22 +- data/tileset_headers.asm | 2 +- data/title_mons.asm | 2 +- data/tm_prices.asm | 2 +- data/tms.asm | 2 +- data/town_map_entries.asm | 4 +- data/town_map_order.asm | 2 +- data/trades.asm | 2 +- data/trainer_moves.asm | 4 +- data/trainer_parties.asm | 2 +- data/trainer_types.asm | 4 +- data/type_effects.asm | 2 +- data/warp_tile_ids.asm | 50 +- data/wild_mons.asm | 2 +- engine/HoF_room_pc.asm | 24 +- engine/battle/animations.asm | 304 ++++---- engine/battle/bank_e_misc.asm | 6 +- engine/battle/battle_transitions.asm | 76 +- engine/battle/common_text.asm | 40 +- engine/battle/core.asm | 636 ++++++++-------- engine/battle/decrement_pp.asm | 2 +- engine/battle/display_effectiveness.asm | 6 +- engine/battle/draw_hud_pokeball_gfx.asm | 28 +- engine/battle/end_of_battle.asm | 10 +- engine/battle/experience.asm | 16 +- engine/battle/get_trainer_name.asm | 2 +- engine/battle/ghost_marowak_anim.asm | 4 +- engine/battle/init_battle_variables.asm | 2 +- engine/battle/link_battle_versus_text.asm | 2 +- engine/battle/moveEffects/conversion_effect.asm | 8 +- engine/battle/moveEffects/drain_hp_effect.asm | 6 +- engine/battle/moveEffects/focus_energy_effect.asm | 4 +- engine/battle/moveEffects/haze_effect.asm | 10 +- engine/battle/moveEffects/heal_effect.asm | 8 +- engine/battle/moveEffects/leech_seed_effect.asm | 6 +- engine/battle/moveEffects/mist_effect.asm | 4 +- engine/battle/moveEffects/one_hit_ko_effect.asm | 2 +- engine/battle/moveEffects/paralyze_effect.asm | 2 +- engine/battle/moveEffects/pay_day_effect.asm | 4 +- engine/battle/moveEffects/recoil_effect.asm | 4 +- .../moveEffects/reflect_light_screen_effect.asm | 8 +- engine/battle/moveEffects/substitute_effect.asm | 8 +- engine/battle/moveEffects/transform_effect.asm | 4 +- engine/battle/print_type.asm | 10 +- engine/battle/read_trainer_party.asm | 2 +- engine/battle/safari_zone.asm | 6 +- engine/battle/save_trainer_name.asm | 46 +- engine/battle/scale_sprites.asm | 10 +- engine/battle/scroll_draw_trainer_pic.asm | 4 +- engine/battle/trainer_ai.asm | 104 +-- engine/battle/trainer_pic_money_pointers.asm | 2 +- engine/battle/unused_stats_functions.asm | 4 +- engine/battle/wild_encounters.asm | 4 +- engine/cable_club.asm | 20 +- engine/clear_save.asm | 4 +- engine/evolution.asm | 12 +- engine/evolve_trade.asm | 2 +- engine/evos_moves.asm | 26 +- engine/experience.asm | 8 +- engine/game_corner_slots.asm | 8 +- engine/game_corner_slots2.asm | 6 +- engine/gamefreak.asm | 26 +- engine/give_pokemon.asm | 10 +- engine/hall_of_fame.asm | 32 +- engine/hidden_object_functions14.asm | 36 +- engine/hidden_object_functions17.asm | 80 +- engine/hidden_object_functions18.asm | 56 +- engine/hidden_object_functions3.asm | 24 +- engine/hidden_object_functions7.asm | 84 +-- engine/hp_bar.asm | 16 +- engine/in_game_trades.asm | 60 +- engine/intro.asm | 56 +- engine/items/itemfinder.asm | 4 +- engine/items/items.asm | 226 +++--- engine/items/tm_prices.asm | 2 +- engine/items/tmhm.asm | 4 +- engine/items/tms.asm | 4 +- engine/learn_move.asm | 28 +- engine/load_pokedex_tiles.asm | 2 +- engine/menu/bills_pc.asm | 34 +- engine/menu/diploma.asm | 6 +- engine/menu/league_pc.asm | 8 +- engine/menu/main_menu.asm | 52 +- engine/menu/naming_screen.asm | 36 +- engine/menu/oaks_pc.asm | 8 +- engine/menu/party_menu.asm | 38 +- engine/menu/pc.asm | 24 +- engine/menu/players_pc.asm | 42 +- engine/menu/pokedex.asm | 34 +- engine/menu/prize_menu.asm | 30 +- engine/menu/start_menu.asm | 6 +- engine/menu/start_sub_menus.asm | 46 +- engine/menu/status_screen.asm | 38 +- engine/menu/vending_machine.asm | 20 +- engine/mon_party_sprites.asm | 28 +- engine/multiply_divide.asm | 4 +- engine/oak_speech.asm | 24 +- engine/oak_speech2.asm | 36 +- engine/overworld/cable_club_npc.asm | 18 +- engine/overworld/card_key.asm | 10 +- engine/overworld/cinnabar_lab.asm | 14 +- engine/overworld/cut.asm | 22 +- engine/overworld/cut2.asm | 6 +- engine/overworld/doors.asm | 26 +- engine/overworld/elevator.asm | 4 +- engine/overworld/emotion_bubbles.asm | 8 +- engine/overworld/healing_machine.asm | 10 +- engine/overworld/hidden_items.asm | 14 +- engine/overworld/hidden_objects.asm | 6 +- engine/overworld/is_player_just_outside_map.asm | 2 +- engine/overworld/ledges.asm | 10 +- engine/overworld/map_sprites.asm | 10 +- engine/overworld/movement.asm | 46 +- engine/overworld/npc_movement.asm | 42 +- engine/overworld/oaks_aide.asm | 12 +- engine/overworld/oam.asm | 2 +- engine/overworld/pewter_guys.asm | 8 +- engine/overworld/player_animations.asm | 52 +- engine/overworld/pokecenter.asm | 12 +- engine/overworld/pokemart.asm | 24 +- engine/overworld/saffron_guards.asm | 4 +- engine/overworld/ssanne.asm | 12 +- engine/overworld/trainers.asm | 22 +- engine/palettes.asm | 64 +- engine/play_time.asm | 4 +- engine/pokedex_rating.asm | 38 +- engine/predefs.asm | 2 +- engine/predefs12.asm | 6 +- engine/predefs17.asm | 2 +- engine/predefs17_2.asm | 2 +- engine/predefs7.asm | 4 +- engine/save.asm | 76 +- engine/slot_machine.asm | 110 +-- engine/status_ailments.asm | 2 +- engine/titlescreen.asm | 32 +- engine/titlescreen2.asm | 16 +- engine/town_map.asm | 46 +- engine/trade.asm | 108 +-- engine/trade2.asm | 6 +- engine/turn_sprite.asm | 2 +- home.asm | 412 +++++------ home/audio.asm | 14 +- home/overworld.asm | 112 +-- home/pic.asm | 42 +- home/serial.asm | 24 +- home/text.asm | 96 +-- home/timer.asm | 2 +- home/vcopy.asm | 12 +- main.asm | 224 +++--- scripts/agatha.asm | 36 +- scripts/billshouse.asm | 48 +- scripts/blueshouse.asm | 22 +- scripts/bruno.asm | 36 +- scripts/celadoncity.asm | 46 +- scripts/celadondiner.asm | 22 +- scripts/celadongamecorner.asm | 108 +-- scripts/celadongym.asm | 104 +-- scripts/celadonhotel.asm | 10 +- scripts/celadonhouse.asm | 10 +- scripts/celadonmansion1.asm | 16 +- scripts/celadonmansion2.asm | 6 +- scripts/celadonmansion3.asm | 20 +- scripts/celadonmansion4.asm | 6 +- scripts/celadonmansion5.asm | 8 +- scripts/celadonprizeroom.asm | 10 +- scripts/ceruleancity.asm | 92 +-- scripts/ceruleancity2.asm | 2 +- scripts/ceruleangym.asm | 62 +- scripts/ceruleanhouse1.asm | 8 +- scripts/ceruleanhouse2.asm | 32 +- scripts/ceruleanhousetrashed.asm | 14 +- scripts/cinnabargym.asm | 112 +-- scripts/cinnabarisland.asm | 22 +- scripts/colosseum.asm | 6 +- scripts/copycatshouse1f.asm | 10 +- scripts/copycatshouse2f.asm | 34 +- scripts/daycarem.asm | 36 +- scripts/diglettscave.asm | 4 +- scripts/diglettscaveroute11.asm | 6 +- scripts/diglettscaveroute2.asm | 6 +- scripts/fanclub.asm | 10 +- scripts/fightingdojo.asm | 74 +- scripts/fuchsiacity.asm | 64 +- scripts/fuchsiagym.asm | 102 +-- scripts/fuchsiahouse1.asm | 10 +- scripts/fuchsiahouse2.asm | 32 +- scripts/fuchsiahouse3.asm | 16 +- scripts/fuchsiameetingroom.asm | 10 +- scripts/gary.asm | 60 +- scripts/halloffameroom.asm | 20 +- scripts/indigoplateau.asm | 4 +- scripts/lab1.asm | 14 +- scripts/lab2.asm | 12 +- scripts/lab3.asm | 22 +- scripts/lab4.asm | 22 +- scripts/lance.asm | 40 +- scripts/lavenderhouse1.asm | 32 +- scripts/lavenderhouse2.asm | 12 +- scripts/lavendertown.asm | 24 +- scripts/lorelei.asm | 36 +- scripts/mansion1.asm | 36 +- scripts/mansion2.asm | 38 +- scripts/mansion3.asm | 40 +- scripts/mansion4.asm | 34 +- scripts/mtmoon1.asm | 80 +- scripts/mtmoon2.asm | 6 +- scripts/mtmoon3.asm | 98 +-- scripts/museum1f.asm | 56 +- scripts/museum2f.asm | 18 +- scripts/namerater.asm | 24 +- scripts/oakslab.asm | 212 +++--- scripts/pallettown.asm | 26 +- scripts/pewtercity.asm | 68 +- scripts/pewtergym.asm | 56 +- scripts/pewterhouse1.asm | 10 +- scripts/pewterhouse2.asm | 8 +- scripts/pokemontower1.asm | 14 +- scripts/pokemontower2.asm | 32 +- scripts/pokemontower3.asm | 38 +- scripts/pokemontower4.asm | 38 +- scripts/pokemontower5.asm | 56 +- scripts/pokemontower6.asm | 56 +- scripts/pokemontower7.asm | 48 +- scripts/redshouse1f.asm | 16 +- scripts/redshouse2f.asm | 10 +- scripts/rockethideout1.asm | 62 +- scripts/rockethideout2.asm | 102 +-- scripts/rockethideout3.asm | 58 +- scripts/rockethideout4.asm | 52 +- scripts/rockethideoutelevator.asm | 20 +- scripts/rocktunnel1.asm | 82 +-- scripts/rocktunnel2.asm | 88 +-- scripts/route1.asm | 18 +- scripts/route10.asm | 74 +- scripts/route11.asm | 110 +-- scripts/route11gate.asm | 6 +- scripts/route11gateupstairs.asm | 18 +- scripts/route12.asm | 94 +-- scripts/route12gate.asm | 6 +- scripts/route12gateupstairs.asm | 24 +- scripts/route12house.asm | 16 +- scripts/route13.asm | 114 +-- scripts/route14.asm | 110 +-- scripts/route15.asm | 112 +-- scripts/route15gate.asm | 6 +- scripts/route15gateupstairs.asm | 12 +- scripts/route16.asm | 84 +-- scripts/route16gate.asm | 28 +- scripts/route16gateupstairs.asm | 20 +- scripts/route16house.asm | 18 +- scripts/route17.asm | 120 +-- scripts/route18.asm | 42 +- scripts/route18gate.asm | 24 +- scripts/route18gateupstairs.asm | 14 +- scripts/route19.asm | 110 +-- scripts/route2.asm | 8 +- scripts/route20.asm | 120 +-- scripts/route21.asm | 98 +-- scripts/route22.asm | 78 +- scripts/route22gate.asm | 24 +- scripts/route23.asm | 60 +- scripts/route24.asm | 92 +-- scripts/route25.asm | 102 +-- scripts/route2gate.asm | 10 +- scripts/route2house.asm | 8 +- scripts/route3.asm | 92 +-- scripts/route4.asm | 24 +- scripts/route5.asm | 6 +- scripts/route5gate.asm | 40 +- scripts/route6.asm | 68 +- scripts/route6gate.asm | 14 +- scripts/route7.asm | 6 +- scripts/route7gate.asm | 14 +- scripts/route8.asm | 100 +-- scripts/route8gate.asm | 14 +- scripts/route9.asm | 102 +-- scripts/safarizonecenter.asm | 8 +- scripts/safarizoneeast.asm | 10 +- scripts/safarizoneentrance.asm | 8 +- scripts/safarizonenorth.asm | 14 +- scripts/safarizoneresthouse1.asm | 8 +- scripts/safarizoneresthouse2.asm | 10 +- scripts/safarizoneresthouse3.asm | 10 +- scripts/safarizoneresthouse4.asm | 10 +- scripts/safarizonesecrethouse.asm | 14 +- scripts/safarizonewest.asm | 12 +- scripts/saffroncity.asm | 50 +- scripts/saffrongym.asm | 108 +-- scripts/saffronhouse1.asm | 12 +- scripts/saffronhouse2.asm | 14 +- scripts/school.asm | 8 +- scripts/silphco1.asm | 6 +- scripts/silphco10.asm | 40 +- scripts/silphco11.asm | 82 +-- scripts/silphco2.asm | 66 +- scripts/silphco3.asm | 40 +- scripts/silphco4.asm | 52 +- scripts/silphco5.asm | 66 +- scripts/silphco6.asm | 76 +- scripts/silphco7.asm | 88 +-- scripts/silphco8.asm | 52 +- scripts/silphco9.asm | 54 +- scripts/silphcoelevator.asm | 18 +- scripts/ssanne1.asm | 8 +- scripts/ssanne10.asm | 72 +- scripts/ssanne2.asm | 42 +- scripts/ssanne3.asm | 6 +- scripts/ssanne4.asm | 4 +- scripts/ssanne5.asm | 34 +- scripts/ssanne6.asm | 26 +- scripts/ssanne7.asm | 22 +- scripts/ssanne8.asm | 60 +- scripts/ssanne9.asm | 76 +- scripts/tradecenter.asm | 6 +- scripts/undergroundpathentranceroute5.asm | 8 +- scripts/undergroundpathentranceroute6.asm | 6 +- scripts/undergroundpathentranceroute7.asm | 6 +- scripts/undergroundpathentranceroute7copy.asm | 12 +- scripts/undergroundpathentranceroute8.asm | 6 +- scripts/undergroundpathns.asm | 4 +- scripts/undergroundpathwe.asm | 4 +- scripts/vermilioncity.asm | 62 +- scripts/vermiliondock.asm | 18 +- scripts/vermiliongym.asm | 72 +- scripts/vermilionhouse1.asm | 10 +- scripts/vermilionhouse2.asm | 16 +- scripts/vermilionhouse3.asm | 6 +- scripts/viridiancity.asm | 76 +- scripts/viridianforest.asm | 54 +- scripts/viridianforestentrance.asm | 8 +- scripts/viridianforestexit.asm | 8 +- scripts/viridiangym.asm | 150 ++-- scripts/viridianhouse.asm | 14 +- text/credits_text.asm | 128 ++-- text/item_names.asm | 2 +- text/map_names.asm | 108 +-- text/monster_names.asm | 2 +- text/move_names.asm | 2 +- text/trainer_names.asm | 2 +- 764 files changed, 8371 insertions(+), 8371 deletions(-) diff --git a/audio.asm b/audio.asm index 7e28b136..ad476c60 100644 --- a/audio.asm +++ b/audio.asm @@ -455,7 +455,7 @@ Music_Cities1AlternateTempo:: ; 0x9b81 SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] -Music_DoLowHealthAlarm:: ; 2136e (8:536e) +Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] cp $ff jr z, .disableAlarm @@ -537,7 +537,7 @@ INCLUDE "engine/menu/bills_pc.asm" INCLUDE "audio/engine_2.asm" -Music_PokeFluteInBattle:: ; 22306 (8:6306) +Music_PokeFluteInBattle:: ; begin playing the "caught mon" sound effect ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent @@ -549,7 +549,7 @@ Music_PokeFluteInBattle:: ; 22306 (8:6306) call Audio2_OverwriteChannelPointer ld de, SFX_08_PokeFlute_Ch3 -Audio2_OverwriteChannelPointer: ; 2231d (8:631d) +Audio2_OverwriteChannelPointer: ld a, e ld [hli], a ld a, d @@ -559,7 +559,7 @@ Audio2_OverwriteChannelPointer: ; 2231d (8:631d) SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] -PlayPokedexRatingSfx:: ; 7d13b (1f:513b) +PlayPokedexRatingSfx:: ld a, [$ffdc] ld c, $0 ld hl, OwnedMonValues @@ -584,7 +584,7 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b) call PlayMusic jp PlayDefaultMusic -PokedexRatingSfxPointers: ; 7d162 (1f:5162) +PokedexRatingSfxPointers: db SFX_DENIED, BANK(SFX_Denied_3) db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) @@ -593,7 +593,7 @@ PokedexRatingSfxPointers: ; 7d162 (1f:5162) db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) -OwnedMonValues: ; 7d170 (1f:5170) +OwnedMonValues: db 10, 40, 60, 90, 120, 150, $ff diff --git a/audio/engine_2.asm b/audio/engine_2.asm index e70a305f..85541409 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,6 +1,6 @@ ; The second of three duplicated sound engines. -Audio2_UpdateMusic:: ; 21879 (8:5879) +Audio2_UpdateMusic:: ld c, CH0 .loop ld b, $0 @@ -42,7 +42,7 @@ Audio2_UpdateMusic:: ; 21879 (8:5879) ; 3: a toggle used only by this routine for vibrato ; 4: pitchbend flag ; 6: dutycycle flag -Audio2_ApplyMusicAffects: ; 218ae (8:58ae) +Audio2_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc @@ -148,7 +148,7 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ; this routine executes all music commands that take up no time, ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached -Audio2_PlayNextNote: ; 21946 (8:5946) +Audio2_PlayNextNote: ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] @@ -169,7 +169,7 @@ Audio2_PlayNextNote: ; 21946 (8:5946) call Audio2_endchannel ret -Audio2_endchannel: ; 21967 (8:5967) +Audio2_endchannel: call Audio2_GetNextMusicByte ld d, a cp $ff ; is this command an endchannel? @@ -258,7 +258,7 @@ Audio2_endchannel: ; 21967 (8:5967) ld [hl], b ret -Audio2_callchannel: ; 219f5 (8:59f5) +Audio2_callchannel: cp $fd ; is this command a callchannel? jp nz, Audio2_loopchannel ; no call Audio2_GetNextMusicByte ; yes @@ -295,7 +295,7 @@ Audio2_callchannel: ; 219f5 (8:59f5) set 1, [hl] ; set the call flag jp Audio2_endchannel -Audio2_loopchannel: ; 21a2a (8:5a2a) +Audio2_loopchannel: cp $fe ; is this command a loopchannel? jp nz, Audio2_notetype ; no call Audio2_GetNextMusicByte ; yes @@ -333,7 +333,7 @@ Audio2_loopchannel: ; 21a2a (8:5a2a) ld [hl], b jp Audio2_endchannel -Audio2_notetype: ; 21a65 (8:5a65) +Audio2_notetype: and $f0 cp $d0 ; is this command a notetype? jp nz, Audio2_toggleperfectpitch ; no @@ -377,7 +377,7 @@ Audio2_notetype: ; 21a65 (8:5a65) .noiseChannel jp Audio2_endchannel -Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4) +Audio2_toggleperfectpitch: ld a, d cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio2_vibrato ; no @@ -389,7 +389,7 @@ Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4) ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio2_endchannel -Audio2_vibrato: ; 21ab6 (8:5ab6) +Audio2_vibrato: cp $ea ; is this command a vibrato? jr nz, Audio2_pitchbend ; no call Audio2_GetNextMusicByte ; yes @@ -423,7 +423,7 @@ Audio2_vibrato: ; 21ab6 (8:5ab6) ld [hl], a ; store depth as both high and low nibbles jp Audio2_endchannel -Audio2_pitchbend: ; 21aee (8:5aee) +Audio2_pitchbend: cp $eb ; is this command a pitchbend? jr nz, Audio2_duty ; no call Audio2_GetNextMusicByte ; yes @@ -454,7 +454,7 @@ Audio2_pitchbend: ; 21aee (8:5aee) ld d, a jp Audio2_notelength -Audio2_duty: ; 21b26 (8:5b26) +Audio2_duty: cp $ec ; is this command a duty? jr nz, Audio2_tempo ; no call Audio2_GetNextMusicByte ; yes @@ -467,7 +467,7 @@ Audio2_duty: ; 21b26 (8:5b26) ld [hl], a ; store duty jp Audio2_endchannel -Audio2_tempo: ; 21b3b (8:5b3b) +Audio2_tempo: cp $ed ; is this command a tempo? jr nz, Audio2_stereopanning ; no ld a, c ; yes @@ -496,7 +496,7 @@ Audio2_tempo: ; 21b3b (8:5b3b) .musicChannelDone jp Audio2_endchannel -Audio2_stereopanning: ; 21b7b (8:5b7b) +Audio2_stereopanning: cp $ee ; is this command a stereopanning? jr nz, Audio2_unknownmusic0xef ; no call Audio2_GetNextMusicByte ; yes @@ -504,7 +504,7 @@ Audio2_stereopanning: ; 21b7b (8:5b7b) jp Audio2_endchannel ; this appears to never be used -Audio2_unknownmusic0xef: ; 21b88 (8:5b88) +Audio2_unknownmusic0xef: cp $ef ; is this command an unknownmusic0xef? jr nz, Audio2_dutycycle ; no call Audio2_GetNextMusicByte ; yes @@ -521,7 +521,7 @@ Audio2_unknownmusic0xef: ; 21b88 (8:5b88) .skip jp Audio2_endchannel -Audio2_dutycycle: ; 21ba7 (8:5ba7) +Audio2_dutycycle: cp $fc ; is this command a dutycycle? jr nz, Audio2_volume ; no call Audio2_GetNextMusicByte ; yes @@ -538,14 +538,14 @@ Audio2_dutycycle: ; 21ba7 (8:5ba7) set 6, [hl] ; set dutycycle flag jp Audio2_endchannel -Audio2_volume: ; 21bc5 (8:5bc5) +Audio2_volume: cp $f0 ; is this command a volume? jr nz, Audio2_executemusic ; no call Audio2_GetNextMusicByte ; yes ld [rNR50], a ; store volume jp Audio2_endchannel -Audio2_executemusic: ; 21bd1 (8:5bd1) +Audio2_executemusic: cp $f8 ; is this command an executemusic? jr nz, Audio2_octave ; no ld b, $0 ; yes @@ -554,7 +554,7 @@ Audio2_executemusic: ; 21bd1 (8:5bd1) set 0, [hl] jp Audio2_endchannel -Audio2_octave: ; 21be0 (8:5be0) +Audio2_octave: and $f0 cp $e0 ; is this command an octave? jr nz, Audio2_unknownsfx0x20 ; no @@ -611,7 +611,7 @@ Audio2_unknownsfx0x20: ; 21bf3 call Audio2_21dcc ret -Audio2_unknownsfx0x10: ; 21c40 (8:5c40) +Audio2_unknownsfx0x10: ld a, c cp CH4 jr c, Audio2_note ; if not a sfx @@ -627,7 +627,7 @@ Audio2_unknownsfx0x10: ; 21c40 (8:5c40) ld [rNR10], a jp Audio2_endchannel -Audio2_note: ; 21c5c (8:5c5c) +Audio2_note: ld a, c cp CH3 jr nz, Audio2_notelength ; if not noise channel @@ -646,7 +646,7 @@ Audio2_note: ; 21c5c (8:5c5c) push bc jr asm_21c7e -Audio2_dnote: ; 21c76 (8:5c76) +Audio2_dnote: ld a, d and $f push af @@ -663,7 +663,7 @@ asm_21c7e pop bc pop de -Audio2_notelength: ; 21c8b (8:5c8b) +Audio2_notelength: ld a, d push af and $f @@ -721,7 +721,7 @@ Audio2_notelength: ; 21c8b (8:5c8b) pop hl ret -Audio2_notepitch: ; 21ce9 (8:5ce9) +Audio2_notepitch: pop af and $f0 cp $c0 ; compare to rest @@ -814,7 +814,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) call Audio2_21dcc ret -Audio2_21d79: ; 21d79 (8:5d79) +Audio2_21d79: ld b, $0 ld hl, Unknown_222e6 add hl, bc @@ -848,7 +848,7 @@ Audio2_21d79: ; 21d79 (8:5d79) ld [rNR51], a ret -Audio2_21daa: ; 21daa (8:5daa) +Audio2_21daa: ld b, $0 ld hl, wChannelNoteDelayCounters add hl, bc @@ -872,7 +872,7 @@ Audio2_21daa: ; 21daa (8:5daa) ld [hl], d ret -Audio2_21dcc: ; 21dcc (8:5dcc) +Audio2_21dcc: ld a, c cp CH2 jr z, .channel3 @@ -927,7 +927,7 @@ Audio2_21dcc: ; 21dcc (8:5dcc) .musicChannel ret -Audio2_21e19: ; 21e19 (8:5e19) +Audio2_21e19: ld a, c cp CH4 jr nz, .asm_21e2e @@ -941,7 +941,7 @@ Audio2_21e19: ; 21e19 (8:5e19) .asm_21e2e ret -Audio2_21e2f: ; 21e2f (8:5e2f) +Audio2_21e2f: call Audio2_21e8b jr c, .asm_21e39 call Audio2_21e9f @@ -965,7 +965,7 @@ Audio2_21e2f: ; 21e2f (8:5e2f) .asm_21e55 ret -Audio2_21e56: ; 21e56 (8:5e56) +Audio2_21e56: call Audio2_21e8b jr c, .asm_21e60 call Audio2_21e9f @@ -984,7 +984,7 @@ Audio2_21e56: ; 21e56 (8:5e56) .asm_21e6c ret -Audio2_21e6d: ; 21e6d (8:5e6d) +Audio2_21e6d: call Audio2_21e8b jr nc, .asm_21e88 ld hl, wChannelCommandPointers @@ -1007,7 +1007,7 @@ Audio2_21e6d: ; 21e6d (8:5e6d) ccf ret -Audio2_21e8b: ; 21e8b (8:5e8b) +Audio2_21e8b: ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_21e94 @@ -1024,7 +1024,7 @@ Audio2_21e8b: ; 21e8b (8:5e8b) scf ret -Audio2_21e9f: ; 21e9f (8:5e9f) +Audio2_21e9f: ld a, [wChannelSoundIDs + CH7] ld b, a ld a, [wChannelSoundIDs + CH4] @@ -1044,7 +1044,7 @@ Audio2_21e9f: ; 21e9f (8:5e9f) scf ret -Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) +Audio2_ApplyPitchBend: ld hl, wChannelFlags1 add hl, bc bit 5, [hl] @@ -1146,7 +1146,7 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) res 5, [hl] ret -Audio2_21f4e: ; 21f4e (8:5f4e) +Audio2_21f4e: ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d @@ -1235,7 +1235,7 @@ Audio2_21f4e: ; 21f4e (8:5f4e) ld [hl], a ret -Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc) +Audio2_ApplyDutyCycle: ld b, $0 ld hl, wChannelDutyCycles add hl, bc @@ -1253,7 +1253,7 @@ Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc) ld [hl], a ret -Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4) +Audio2_GetNextMusicByte: ld d, $0 ld a, c add a @@ -1271,7 +1271,7 @@ Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4) ld [hl], d ret -Audio2_21ff7: ; 21ff7 (8:5ff7) +Audio2_21ff7: ld a, c ld hl, Unknown_222d6 add l @@ -1285,7 +1285,7 @@ Audio2_21ff7: ; 21ff7 (8:5ff7) ld h, $ff ret -Audio2_22006: ; 22006 (8:6006) +Audio2_22006: ld h, $0 .loop srl a @@ -1300,7 +1300,7 @@ Audio2_22006: ; 22006 (8:6006) .done ret -Audio2_22017: ; 22017 (8:6017) +Audio2_22017: ld h, $0 ld l, a add hl, hl @@ -1325,7 +1325,7 @@ Audio2_22017: ; 22017 (8:6017) ld d, a ret -Audio2_PlaySound:: ; 22035 (8:6035) +Audio2_PlaySound:: ld [wSoundID], a cp $ff jp z, Audio2_221f3 @@ -1408,7 +1408,7 @@ Audio2_PlaySound:: ; 22035 (8:6035) ld [rNR50], a jp Audio2_2224e -Audio2_2210d: ; 2210d (8:610d) +Audio2_2210d: ld l, a ld e, a ld h, $0 @@ -1559,7 +1559,7 @@ Audio2_2210d: ; 2210d (8:610d) dec c jp .asm_22126 -Audio2_221f3: ; 221f3 (8:61f3) +Audio2_221f3: ld a, $80 ld [rNR52], a ld [rNR30], a @@ -1599,7 +1599,7 @@ Audio2_221f3: ; 221f3 (8:61f3) ret ; fills d bytes at hl with a -FillAudioRAM2: ; 22248 (8:6248) +FillAudioRAM2: ld b, d .loop ld [hli], a @@ -1607,7 +1607,7 @@ FillAudioRAM2: ; 22248 (8:6248) jr nz, .loop ret -Audio2_2224e: ; 2224e (8:624e) +Audio2_2224e: ld a, [wSoundID] ld l, a ld e, a @@ -1702,22 +1702,22 @@ Audio2_2224e: ; 2224e (8:624e) .asm_222d4 ret -Noise2_endchannel: ; 222d5 (8:62d5) +Noise2_endchannel: endchannel -Unknown_222d6: ; 222d6 (8:62d6) +Unknown_222d6: db $10, $15, $1A, $1F ; channels 0-3 db $10, $15, $1A, $1F ; channels 4-7 -Unknown_222de: ; 222de (8:62de) +Unknown_222de: db $EE, $DD, $BB, $77 ; channels 0-3 db $EE, $DD, $BB, $77 ; channels 4-7 -Unknown_222e6: ; 222e6 (8:62e6) +Unknown_222e6: db $11, $22, $44, $88 ; channels 0-3 db $11, $22, $44, $88 ; channels 4-7 -Audio2_Pitches: ; 222ee (8:62ee) +Audio2_Pitches: dw $F82C ; C_ dw $F89D ; C# dw $F907 ; D_ diff --git a/audio/engine_3.asm b/audio/engine_3.asm index c7254405..33baa5c6 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,6 +1,6 @@ ; The third of three duplicated sound engines. -Audio3_UpdateMusic:: ; 7d177 (1f:5177) +Audio3_UpdateMusic:: ld c, CH0 .loop ld b, $0 @@ -42,7 +42,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177) ; 3: a toggle used only by this routine for vibrato ; 4: pitchbend flag ; 6: dutycycle flag -Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) +Audio3_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc @@ -148,7 +148,7 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ; this routine executes all music commands that take up no time, ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached -Audio3_PlayNextNote: ; 7d244 (1f:5244) +Audio3_PlayNextNote: ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] @@ -162,7 +162,7 @@ Audio3_PlayNextNote: ; 7d244 (1f:5244) call Audio3_endchannel ret -Audio3_endchannel: ; 7d25a (1f:525a) +Audio3_endchannel: call Audio3_GetNextMusicByte ld d, a cp $ff ; is this command an endchannel? @@ -251,7 +251,7 @@ Audio3_endchannel: ; 7d25a (1f:525a) ld [hl], b ret -Audio3_callchannel: ; 7d2e8 (1f:52e8) +Audio3_callchannel: cp $fd ; is this command a callchannel? jp nz, Audio3_loopchannel ; no call Audio3_GetNextMusicByte ; yes @@ -288,7 +288,7 @@ Audio3_callchannel: ; 7d2e8 (1f:52e8) set 1, [hl] ; set the call flag jp Audio3_endchannel -Audio3_loopchannel: ; 7d31d (1f:531d) +Audio3_loopchannel: cp $fe ; is this command a loopchannel? jp nz, Audio3_notetype ; no call Audio3_GetNextMusicByte ; yes @@ -326,7 +326,7 @@ Audio3_loopchannel: ; 7d31d (1f:531d) ld [hl], b jp Audio3_endchannel -Audio3_notetype: ; 7d358 (1f:5358) +Audio3_notetype: and $f0 cp $d0 ; is this command a notetype? jp nz, Audio3_toggleperfectpitch ; no @@ -370,7 +370,7 @@ Audio3_notetype: ; 7d358 (1f:5358) .noiseChannel jp Audio3_endchannel -Audio3_toggleperfectpitch: ; 7d397 (1f:5397) +Audio3_toggleperfectpitch: ld a, d cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio3_vibrato ; no @@ -382,7 +382,7 @@ Audio3_toggleperfectpitch: ; 7d397 (1f:5397) ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio3_endchannel -Audio3_vibrato: ; 7d3a9 (1f:53a9) +Audio3_vibrato: cp $ea ; is this command a vibrato? jr nz, Audio3_pitchbend ; no call Audio3_GetNextMusicByte ; yes @@ -416,7 +416,7 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9) ld [hl], a ; store depth as both high and low nibbles jp Audio3_endchannel -Audio3_pitchbend: ; 7d3e1 (1f:53e1) +Audio3_pitchbend: cp $eb ; is this command a pitchbend? jr nz, Audio3_duty ; no call Audio3_GetNextMusicByte ; yes @@ -447,7 +447,7 @@ Audio3_pitchbend: ; 7d3e1 (1f:53e1) ld d, a jp Audio3_notelength -Audio3_duty: ; 7d419 (1f:5419) +Audio3_duty: cp $ec ; is this command a duty? jr nz, Audio3_tempo ; no call Audio3_GetNextMusicByte ; yes @@ -460,7 +460,7 @@ Audio3_duty: ; 7d419 (1f:5419) ld [hl], a ; store duty jp Audio3_endchannel -Audio3_tempo: ; 7d42e (1f:542e) +Audio3_tempo: cp $ed ; is this command a tempo? jr nz, Audio3_stereopanning ; no ld a, c ; yes @@ -489,7 +489,7 @@ Audio3_tempo: ; 7d42e (1f:542e) .musicChannelDone jp Audio3_endchannel -Audio3_stereopanning: ; 7d46e (1f:546e) +Audio3_stereopanning: cp $ee ; is this command a stereopanning? jr nz, Audio3_unknownmusic0xef ; no call Audio3_GetNextMusicByte ; yes @@ -497,7 +497,7 @@ Audio3_stereopanning: ; 7d46e (1f:546e) jp Audio3_endchannel ; this appears to never be used -Audio3_unknownmusic0xef: ; 7d47b (1f:547b) +Audio3_unknownmusic0xef: cp $ef ; is this command an unknownmusic0xef? jr nz, Audio3_dutycycle ; no call Audio3_GetNextMusicByte ; yes @@ -514,7 +514,7 @@ Audio3_unknownmusic0xef: ; 7d47b (1f:547b) .skip jp Audio3_endchannel -Audio3_dutycycle: ; 7d49a (1f:549a) +Audio3_dutycycle: cp $fc ; is this command a dutycycle? jr nz, Audio3_volume ; no call Audio3_GetNextMusicByte ; yes @@ -531,14 +531,14 @@ Audio3_dutycycle: ; 7d49a (1f:549a) set 6, [hl] ; set duty flag jp Audio3_endchannel -Audio3_volume: ; 7d4b8 (1f:54b8) +Audio3_volume: cp $f0 ; is this command a volume? jr nz, Audio3_executemusic ; no call Audio3_GetNextMusicByte ; yes ld [rNR50], a ; store volume jp Audio3_endchannel -Audio3_executemusic: ; 7d4c4 (1f:54c4) +Audio3_executemusic: cp $f8 ; is this command an executemusic? jr nz, Audio3_octave ; no ld b, $0 ; yes @@ -547,7 +547,7 @@ Audio3_executemusic: ; 7d4c4 (1f:54c4) set 0, [hl] jp Audio3_endchannel -Audio3_octave: ; 7d4d3 (1f:54d3) +Audio3_octave: and $f0 cp $e0 ; is this command an octave? jr nz, Audio3_unknownsfx0x20 ; no @@ -559,7 +559,7 @@ Audio3_octave: ; 7d4d3 (1f:54d3) ld [hl], a ; store low nibble as octave jp Audio3_endchannel -Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6) +Audio3_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio3_unknownsfx0x10 ; no ld a, c @@ -604,7 +604,7 @@ Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6) call Audio3_7d6bf ret -Audio3_unknownsfx0x10: ; 7d533 (1f:5533) +Audio3_unknownsfx0x10: ld a, c cp CH4 jr c, Audio3_note ; if not a sfx @@ -620,7 +620,7 @@ Audio3_unknownsfx0x10: ; 7d533 (1f:5533) ld [rNR10], a jp Audio3_endchannel -Audio3_note: ; 7d54f (1f:554f) +Audio3_note: ld a, c cp CH3 jr nz, Audio3_notelength ; if not noise channel @@ -639,7 +639,7 @@ Audio3_note: ; 7d54f (1f:554f) push bc jr asm_7d571 -Audio3_dnote: ; 7d569 (1f:5569) +Audio3_dnote: ld a, d and $f push af @@ -656,7 +656,7 @@ asm_7d571 pop bc pop de -Audio3_notelength: ; 7d57e (1f:557e) +Audio3_notelength: ld a, d push af and $f @@ -714,7 +714,7 @@ Audio3_notelength: ; 7d57e (1f:557e) pop hl ret -Audio3_notepitch: ; 7d5dc (1f:55dc) +Audio3_notepitch: pop af and $f0 cp $c0 ; compare to rest @@ -807,7 +807,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) call Audio3_7d6bf ret -Audio3_7d66c: ; 7d66c (1f:566c) +Audio3_7d66c: ld b, $0 ld hl, Unknown_7db9b add hl, bc @@ -841,7 +841,7 @@ Audio3_7d66c: ; 7d66c (1f:566c) ld [rNR51], a ret -Audio3_7d69d: ; 7d69d (1f:569d) +Audio3_7d69d: ld b, $0 ld hl, wChannelNoteDelayCounters add hl, bc @@ -865,7 +865,7 @@ Audio3_7d69d: ; 7d69d (1f:569d) ld [hl], d ret -Audio3_7d6bf: ; 7d6bf (1f:56bf) +Audio3_7d6bf: ld a, c cp CH2 jr z, .channel3 @@ -916,7 +916,7 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf) call Audio3_7d729 ret -Audio3_7d707: ; 7d707 (1f:5707) +Audio3_7d707: call Audio3_7d759 jr nc, .asm_7d71f ld d, $0 @@ -937,7 +937,7 @@ Audio3_7d707: ; 7d707 (1f:5707) .asm_7d728 ret -Audio3_7d729: ; 7d729 (1f:5729) +Audio3_7d729: call Audio3_7d759 jr nc, .asm_7d73a ld a, [wFrequencyModifier] @@ -953,7 +953,7 @@ Audio3_7d729: ; 7d729 (1f:5729) .asm_7d73a ret -Audio3_7d73b: ; 7d73b (1f:573b) +Audio3_7d73b: call Audio3_7d759 jr nc, .asm_7d756 ld hl, wChannelCommandPointers @@ -976,7 +976,7 @@ Audio3_7d73b: ; 7d73b (1f:573b) ccf ret -Audio3_7d759: ; 7d759 (1f:5759) +Audio3_7d759: ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_7d762 @@ -993,7 +993,7 @@ Audio3_7d759: ; 7d759 (1f:5759) scf ret -Audio3_ApplyPitchBend: ; 7d76d (1f:576d) +Audio3_ApplyPitchBend: ld hl, wChannelFlags1 add hl, bc bit 5, [hl] @@ -1095,7 +1095,7 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d) res 5, [hl] ret -Audio3_7d803: ; 7d803 (1f:5803) +Audio3_7d803: ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d @@ -1184,7 +1184,7 @@ Audio3_7d803: ; 7d803 (1f:5803) ld [hl], a ret -Audio3_ApplyDutyCycle: ; 7d881 (1f:5881) +Audio3_ApplyDutyCycle: ld b, $0 ld hl, wChannelDutyCycles add hl, bc @@ -1202,7 +1202,7 @@ Audio3_ApplyDutyCycle: ; 7d881 (1f:5881) ld [hl], a ret -Audio3_GetNextMusicByte: ; 7d899 (1f:5899) +Audio3_GetNextMusicByte: ld d, $0 ld a, c add a @@ -1220,7 +1220,7 @@ Audio3_GetNextMusicByte: ; 7d899 (1f:5899) ld [hl], d ret -Audio3_7d8ac: ; 7d8ac (1f:58ac) +Audio3_7d8ac: ld a, c ld hl, Unknown_7db8b add l @@ -1234,7 +1234,7 @@ Audio3_7d8ac: ; 7d8ac (1f:58ac) ld h, $ff ret -Audio3_7d8bb: ; 7d8bb (1f:58bb) +Audio3_7d8bb: ld h, $0 .loop srl a @@ -1249,7 +1249,7 @@ Audio3_7d8bb: ; 7d8bb (1f:58bb) .done ret -Audio3_7d8cc: ; 7d8cc (1f:58cc) +Audio3_7d8cc: ld h, $0 ld l, a add hl, hl @@ -1274,7 +1274,7 @@ Audio3_7d8cc: ; 7d8cc (1f:58cc) ld d, a ret -Audio3_PlaySound:: ; 7d8ea (1f:58ea) +Audio3_PlaySound:: ld [wSoundID], a cp $ff jp z, Audio3_7daa8 @@ -1357,7 +1357,7 @@ Audio3_PlaySound:: ; 7d8ea (1f:58ea) ld [rNR50], a jp Audio3_7db03 -Audio3_7d9c2: ; 7d9c2 (1f:59c2) +Audio3_7d9c2: ld l, a ld e, a ld h, $0 @@ -1508,7 +1508,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) dec c jp .asm_7d9db -Audio3_7daa8: ; 7daa8 (1f:5aa8) +Audio3_7daa8: ld a, $80 ld [rNR52], a ld [rNR30], a @@ -1548,7 +1548,7 @@ Audio3_7daa8: ; 7daa8 (1f:5aa8) ret ; fills d bytes at hl with a -FillAudioRAM3: ; 7dafd (1f:5afd) +FillAudioRAM3: ld b, d .loop ld [hli], a @@ -1556,7 +1556,7 @@ FillAudioRAM3: ; 7dafd (1f:5afd) jr nz, .loop ret -Audio3_7db03: ; 7db03 (1f:5b03) +Audio3_7db03: ld a, [wSoundID] ld l, a ld e, a @@ -1651,22 +1651,22 @@ Audio3_7db03: ; 7db03 (1f:5b03) .asm_7db89 ret -Noise3_endchannel: ; 7db8a (1f:5b8a) +Noise3_endchannel: endchannel -Unknown_7db8b: ; 7db8b (1f:5b8b) +Unknown_7db8b: db $10, $15, $1A, $1F ; channels 0-3 db $10, $15, $1A, $1F ; channels 4-7 -Unknown_7db93: ; 7db93 (1f:5b93) +Unknown_7db93: db $EE, $DD, $BB, $77 ; channels 0-3 db $EE, $DD, $BB, $77 ; channels 4-7 -Unknown_7db9b: ; 7db9b (1f:5b9b) +Unknown_7db9b: db $11, $22, $44, $88 ; channels 0-3 db $11, $22, $44, $88 ; channels 4-7 -Audio3_Pitches: ; 7dba3 (1f:5ba3) +Audio3_Pitches: dw $F82C ; C_ dw $F89D ; C# dw $F907 ; D_ diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index a6449436..5a762b30 100755 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,4 +1,4 @@ -Music_PalletTown:: ; 822e (2:422e) +Music_PalletTown:: db ( $80 | CH0 ) dw Music_PalletTown_Ch1 db CH1 @@ -6,7 +6,7 @@ Music_PalletTown:: ; 822e (2:422e) db CH2 dw Music_PalletTown_Ch3 -Music_Pokecenter:: ; 8237 (2:4237) +Music_Pokecenter:: db ( $80 | CH0 ) dw Music_Pokecenter_Ch1 db CH1 @@ -14,7 +14,7 @@ Music_Pokecenter:: ; 8237 (2:4237) db CH2 dw Music_Pokecenter_Ch3 -Music_Gym:: ; 8240 (2:4240) +Music_Gym:: db ( $80 | CH0 ) dw Music_Gym_Ch1 db CH1 @@ -23,7 +23,7 @@ Music_Gym:: ; 8240 (2:4240) dw Music_Gym_Ch3 ; Viridian City, Pewter City, Saffron City -Music_Cities1:: ; 8249 (2:4249) +Music_Cities1:: db ( $C0 | CH0 ) dw Music_Cities1_Ch1 db CH1 @@ -34,7 +34,7 @@ Music_Cities1:: ; 8249 (2:4249) dw Music_Cities1_Ch4 ; Cerulean City, Fuchsia City -Music_Cities2:: ; 8255 (2:4255) +Music_Cities2:: db ( $80 | CH0 ) dw Music_Cities2_Ch1 db CH1 @@ -42,7 +42,7 @@ Music_Cities2:: ; 8255 (2:4255) db CH2 dw Music_Cities2_Ch3 -Music_Celadon:: ; 825e (2:425e) +Music_Celadon:: db ( $80 | CH0 ) dw Music_Celadon_Ch1 db CH1 @@ -50,7 +50,7 @@ Music_Celadon:: ; 825e (2:425e) db CH2 dw Music_Celadon_Ch3 -Music_Cinnabar:: ; 8267 (2:4267) +Music_Cinnabar:: db ( $80 | CH0 ) dw Music_Cinnabar_Ch1 db CH1 @@ -58,7 +58,7 @@ Music_Cinnabar:: ; 8267 (2:4267) db CH2 dw Music_Cinnabar_Ch3 -Music_Vermilion:: ; 8270 (2:4270) +Music_Vermilion:: db ( $C0 | CH0 ) dw Music_Vermilion_Ch1 db CH1 @@ -68,7 +68,7 @@ Music_Vermilion:: ; 8270 (2:4270) db CH3 dw Music_Vermilion_Ch4 -Music_Lavender:: ; 827c (2:427c) +Music_Lavender:: db ( $C0 | CH0 ) dw Music_Lavender_Ch1 db CH1 @@ -78,7 +78,7 @@ Music_Lavender:: ; 827c (2:427c) db CH3 dw Music_Lavender_Ch4 -Music_SSAnne:: ; 8288 (2:4288) +Music_SSAnne:: db ( $80 | CH0 ) dw Music_SSAnne_Ch1 db CH1 @@ -86,7 +86,7 @@ Music_SSAnne:: ; 8288 (2:4288) db CH2 dw Music_SSAnne_Ch3 -Music_MeetProfOak:: ; 8291 (2:4291) +Music_MeetProfOak:: db ( $80 | CH0 ) dw Music_MeetProfOak_Ch1 db CH1 @@ -94,7 +94,7 @@ Music_MeetProfOak:: ; 8291 (2:4291) db CH2 dw Music_MeetProfOak_Ch3 -Music_MeetRival:: ; 829a (2:429a) +Music_MeetRival:: db ( $80 | CH0 ) dw Music_MeetRival_Ch1 db CH1 @@ -102,7 +102,7 @@ Music_MeetRival:: ; 829a (2:429a) db CH2 dw Music_MeetRival_Ch3 -Music_MuseumGuy:: ; 82a3 (2:42a3) +Music_MuseumGuy:: db ( $C0 | CH0 ) dw Music_MuseumGuy_Ch1 db CH1 @@ -112,7 +112,7 @@ Music_MuseumGuy:: ; 82a3 (2:42a3) db CH3 dw Music_MuseumGuy_Ch4 -Music_SafariZone:: ; 82af (2:42af) +Music_SafariZone:: db ( $80 | CH0 ) dw Music_SafariZone_Ch1 db CH1 @@ -120,7 +120,7 @@ Music_SafariZone:: ; 82af (2:42af) db CH2 dw Music_SafariZone_Ch3 -Music_PkmnHealed:: ; 82b8 (2:42b8) +Music_PkmnHealed:: db ( $80 | CH0 ) dw Music_PkmnHealed_Ch1 db CH1 @@ -129,7 +129,7 @@ Music_PkmnHealed:: ; 82b8 (2:42b8) dw Music_PkmnHealed_Ch3 ; Routes 1 and 2 -Music_Routes1:: ; 82c1 (2:42c1) +Music_Routes1:: db ( $C0 | CH0 ) dw Music_Routes1_Ch1 db CH1 @@ -140,7 +140,7 @@ Music_Routes1:: ; 82c1 (2:42c1) dw Music_Routes1_Ch4 ; Routes 24 and 25 -Music_Routes2:: ; 82cd (2:42cd) +Music_Routes2:: db ( $C0 | CH0 ) dw Music_Routes2_Ch1 db CH1 @@ -151,7 +151,7 @@ Music_Routes2:: ; 82cd (2:42cd) dw Music_Routes2_Ch4 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 -Music_Routes3:: ; 82d9 (2:42d9) +Music_Routes3:: db ( $C0 | CH0 ) dw Music_Routes3_Ch1 db CH1 @@ -162,7 +162,7 @@ Music_Routes3:: ; 82d9 (2:42d9) dw Music_Routes3_Ch4 ; Routes 11, 12, 13, 14, 15 -Music_Routes4:: ; 82d5 (2:42d5) +Music_Routes4:: db ( $C0 | CH0 ) dw Music_Routes4_Ch1 db CH1 @@ -173,7 +173,7 @@ Music_Routes4:: ; 82d5 (2:42d5) dw Music_Routes4_Ch4 ; Route 23, Indigo Plateau -Music_IndigoPlateau:: ; 82f1 (2:42f1) +Music_IndigoPlateau:: db ( $C0 | CH0 ) dw Music_IndigoPlateau_Ch1 db CH1 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 85cf2825..7f98249d 100755 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,4 +1,4 @@ -Music_GymLeaderBattle:: ; 202be (8:42be) +Music_GymLeaderBattle:: db ( $80 | CH0 ) dw Music_GymLeaderBattle_Ch1 db CH1 @@ -6,7 +6,7 @@ Music_GymLeaderBattle:: ; 202be (8:42be) db CH2 dw Music_GymLeaderBattle_Ch3 -Music_TrainerBattle:: ; 202c7 (8:42c7) +Music_TrainerBattle:: db ( $80 | CH0 ) dw Music_TrainerBattle_Ch1 db CH1 @@ -14,7 +14,7 @@ Music_TrainerBattle:: ; 202c7 (8:42c7) db CH2 dw Music_TrainerBattle_Ch3 -Music_WildBattle:: ; 202d0 (8:42d0) +Music_WildBattle:: db ( $80 | CH0 ) dw Music_WildBattle_Ch1 db CH1 @@ -22,7 +22,7 @@ Music_WildBattle:: ; 202d0 (8:42d0) db CH2 dw Music_WildBattle_Ch3 -Music_FinalBattle:: ; 202d9 (8:42d9) +Music_FinalBattle:: db ( $80 | CH0 ) dw Music_FinalBattle_Ch1 db CH1 @@ -30,7 +30,7 @@ Music_FinalBattle:: ; 202d9 (8:42d9) db CH2 dw Music_FinalBattle_Ch3 -Music_DefeatedTrainer:: ; 202e2 (8:42e2) +Music_DefeatedTrainer:: db ( $80 | CH0 ) dw Music_DefeatedTrainer_Ch1 db CH1 @@ -38,7 +38,7 @@ Music_DefeatedTrainer:: ; 202e2 (8:42e2) db CH2 dw Music_DefeatedTrainer_Ch3 -Music_DefeatedWildMon:: ; 202eb (8:42eb) +Music_DefeatedWildMon:: db ( $80 | CH0 ) dw Music_DefeatedWildMon_Ch1 db CH1 @@ -46,7 +46,7 @@ Music_DefeatedWildMon:: ; 202eb (8:42eb) db CH2 dw Music_DefeatedWildMon_Ch3 -Music_DefeatedGymLeader:: ; 202f4 (8:42f4) +Music_DefeatedGymLeader:: db ( $80 | CH0 ) dw Music_DefeatedGymLeader_Ch1 db CH1 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 7846e48f..1c54b266 100755 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,4 +1,4 @@ -Music_TitleScreen:: ; 7c249 (1f:4249) +Music_TitleScreen:: db ( $C0 | CH0 ) dw Music_TitleScreen_Ch1 db CH1 @@ -8,7 +8,7 @@ Music_TitleScreen:: ; 7c249 (1f:4249) db CH3 dw Music_TitleScreen_Ch4 -Music_Credits:: ; 7c255 (1f:4255) +Music_Credits:: db ( $80 | CH0 ) dw Music_Credits_Ch1 db CH1 @@ -16,7 +16,7 @@ Music_Credits:: ; 7c255 (1f:4255) db CH2 dw Music_Credits_Ch3 -Music_HallOfFame:: ; 7c25e (1f:425e) +Music_HallOfFame:: db ( $80 | CH0 ) dw Music_HallOfFame_Ch1 db CH1 @@ -24,7 +24,7 @@ Music_HallOfFame:: ; 7c25e (1f:425e) db CH2 dw Music_HallOfFame_Ch3 -Music_OaksLab:: ; 7c267 (1f:4267) +Music_OaksLab:: db ( $80 | CH0 ) dw Music_OaksLab_Ch1 db CH1 @@ -32,13 +32,13 @@ Music_OaksLab:: ; 7c267 (1f:4267) db CH2 dw Music_OaksLab_Ch3 -Music_JigglypuffSong:: ; 7c270 (1f:4270) +Music_JigglypuffSong:: db $40 dw Music_JigglypuffSong_Ch1 db CH1 dw Music_JigglypuffSong_Ch2 -Music_BikeRiding:: ; 7c276 (1f:4276) +Music_BikeRiding:: db ( $C0 | CH0 ) dw Music_BikeRiding_Ch1 db CH1 @@ -48,7 +48,7 @@ Music_BikeRiding:: ; 7c276 (1f:4276) db CH3 dw Music_BikeRiding_Ch4 -Music_Surfing:: ; 7c282 (1f:4282) +Music_Surfing:: db ( $80 | CH0 ) dw Music_Surfing_Ch1 db CH1 @@ -56,7 +56,7 @@ Music_Surfing:: ; 7c282 (1f:4282) db CH2 dw Music_Surfing_Ch3 -Music_GameCorner:: ; 7c28b (1f:428b) +Music_GameCorner:: db ( $80 | CH0 ) dw Music_GameCorner_Ch1 db CH1 @@ -64,7 +64,7 @@ Music_GameCorner:: ; 7c28b (1f:428b) db CH2 dw Music_GameCorner_Ch3 -Music_IntroBattle:: ; 7c294 (1f:4294) +Music_IntroBattle:: db ( $C0 | CH0 ) dw Music_IntroBattle_Ch1 db CH1 @@ -75,7 +75,7 @@ Music_IntroBattle:: ; 7c294 (1f:4294) dw Music_IntroBattle_Ch4 ; Power Plant, Unknown Dungeon, Rocket HQ -Music_Dungeon1:: ; 7c2a0 (1f:42a0) +Music_Dungeon1:: db ( $C0 | CH0 ) dw Music_Dungeon1_Ch1 db CH1 @@ -86,7 +86,7 @@ Music_Dungeon1:: ; 7c2a0 (1f:42a0) dw Music_Dungeon1_Ch4 ; Viridian Forest, Seafoam Islands -Music_Dungeon2:: ; 7c2ac (1f:42ac) +Music_Dungeon2:: db ( $C0 | CH0 ) dw Music_Dungeon2_Ch1 db CH1 @@ -97,7 +97,7 @@ Music_Dungeon2:: ; 7c2ac (1f:42ac) dw Music_Dungeon2_Ch4 ; Mt. Moon, Rock Tunnel, Victory Road -Music_Dungeon3:: ; 7c2b8 (1f:42b8) +Music_Dungeon3:: db ( $C0 | CH0 ) dw Music_Dungeon3_Ch1 db CH1 @@ -107,7 +107,7 @@ Music_Dungeon3:: ; 7c2b8 (1f:42b8) db CH3 dw Music_Dungeon3_Ch4 -Music_CinnabarMansion:: ; 7c2c4 (1f:42c4) +Music_CinnabarMansion:: db ( $C0 | CH0 ) dw Music_CinnabarMansion_Ch1 db CH1 @@ -117,7 +117,7 @@ Music_CinnabarMansion:: ; 7c2c4 (1f:42c4) db CH3 dw Music_CinnabarMansion_Ch4 -Music_PokemonTower:: ; 7c2d0 (1f:42d0) +Music_PokemonTower:: db ( $80 | CH0 ) dw Music_PokemonTower_Ch1 db CH1 @@ -125,7 +125,7 @@ Music_PokemonTower:: ; 7c2d0 (1f:42d0) db CH2 dw Music_PokemonTower_Ch3 -Music_SilphCo:: ; 7c2d9 (1f:42d9) +Music_SilphCo:: db ( $80 | CH0 ) dw Music_SilphCo_Ch1 db CH1 @@ -133,7 +133,7 @@ Music_SilphCo:: ; 7c2d9 (1f:42d9) db CH2 dw Music_SilphCo_Ch3 -Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2) +Music_MeetEvilTrainer:: db ( $80 | CH0 ) dw Music_MeetEvilTrainer_Ch1 db CH1 @@ -141,7 +141,7 @@ Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2) db CH2 dw Music_MeetEvilTrainer_Ch3 -Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb) +Music_MeetFemaleTrainer:: db ( $80 | CH0 ) dw Music_MeetFemaleTrainer_Ch1 db CH1 @@ -149,7 +149,7 @@ Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb) db CH2 dw Music_MeetFemaleTrainer_Ch3 -Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4) +Music_MeetMaleTrainer:: db ( $80 | CH0 ) dw Music_MeetMaleTrainer_Ch1 db CH1 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 49370aa4..57c62e1c 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,83 +1,83 @@ SFX_Headers_1:: db $ff, $ff, $ff ; padding -SFX_Snare1_1:: ; 8003 (2:4003) +SFX_Snare1_1:: db CH7 dw SFX_Snare1_1_Ch1 -SFX_Snare2_1:: ; 8006 (2:4006) +SFX_Snare2_1:: db CH7 dw SFX_Snare2_1_Ch1 -SFX_Snare3_1:: ; 8009 (2:4009) +SFX_Snare3_1:: db CH7 dw SFX_Snare3_1_Ch1 -SFX_Snare4_1:: ; 800c (2:400c) +SFX_Snare4_1:: db CH7 dw SFX_Snare4_1_Ch1 -SFX_Snare5_1:: ; 800f (2:400f) +SFX_Snare5_1:: db CH7 dw SFX_Snare5_1_Ch1 -SFX_Triangle1_1:: ; 8012 (2:4012) +SFX_Triangle1_1:: db CH7 dw SFX_Triangle1_1_Ch1 -SFX_Triangle2_1:: ; 8015 (2:4015) +SFX_Triangle2_1:: db CH7 dw SFX_Triangle2_1_Ch1 -SFX_Snare6_1:: ; 8018 (2:4018) +SFX_Snare6_1:: db CH7 dw SFX_Snare6_1_Ch1 -SFX_Snare7_1:: ; 801b (2:401b) +SFX_Snare7_1:: db CH7 dw SFX_Snare7_1_Ch1 -SFX_Snare8_1:: ; 801e (2:401e) +SFX_Snare8_1:: db CH7 dw SFX_Snare8_1_Ch1 -SFX_Snare9_1:: ; 8021 (2:4021) +SFX_Snare9_1:: db CH7 dw SFX_Snare9_1_Ch1 -SFX_Cymbal1_1:: ; 8024 (2:4024) +SFX_Cymbal1_1:: db CH7 dw SFX_Cymbal1_1_Ch1 -SFX_Cymbal2_1:: ; 8027 (2:4027) +SFX_Cymbal2_1:: db CH7 dw SFX_Cymbal2_1_Ch1 -SFX_Cymbal3_1:: ; 802a (2:402a) +SFX_Cymbal3_1:: db CH7 dw SFX_Cymbal3_1_Ch1 -SFX_Muted_Snare1_1:: ; 802d (2:402d) +SFX_Muted_Snare1_1:: db CH7 dw SFX_Muted_Snare1_1_Ch1 -SFX_Triangle3_1:: ; 8030 (2:4030) +SFX_Triangle3_1:: db CH7 dw SFX_Triangle3_1_Ch1 -SFX_Muted_Snare2_1:: ; 8033 (2:4033) +SFX_Muted_Snare2_1:: db CH7 dw SFX_Muted_Snare2_1_Ch1 -SFX_Muted_Snare3_1:: ; 8036 (2:4036) +SFX_Muted_Snare3_1:: db CH7 dw SFX_Muted_Snare3_1_Ch1 -SFX_Muted_Snare4_1:: ; 8039 (2:4039) +SFX_Muted_Snare4_1:: db CH7 dw SFX_Muted_Snare4_1_Ch1 -SFX_Cry00_1:: ; 803c (2:403c) +SFX_Cry00_1:: db ( $80 | CH4 ) dw SFX_Cry00_1_Ch1 db CH5 @@ -85,7 +85,7 @@ SFX_Cry00_1:: ; 803c (2:403c) db CH7 dw SFX_Cry00_1_Ch3 -SFX_Cry01_1:: ; 8045 (2:4045) +SFX_Cry01_1:: db ( $80 | CH4 ) dw SFX_Cry01_1_Ch1 db CH5 @@ -93,7 +93,7 @@ SFX_Cry01_1:: ; 8045 (2:4045) db CH7 dw SFX_Cry01_1_Ch3 -SFX_Cry02_1:: ; 804e (2:404e) +SFX_Cry02_1:: db ( $80 | CH4 ) dw SFX_Cry02_1_Ch1 db CH5 @@ -101,7 +101,7 @@ SFX_Cry02_1:: ; 804e (2:404e) db CH7 dw SFX_Cry02_1_Ch3 -SFX_Cry03_1:: ; 8057 (2:4057) +SFX_Cry03_1:: db ( $80 | CH4 ) dw SFX_Cry03_1_Ch1 db CH5 @@ -109,7 +109,7 @@ SFX_Cry03_1:: ; 8057 (2:4057) db CH7 dw SFX_Cry03_1_Ch3 -SFX_Cry04_1:: ; 8060 (2:4060) +SFX_Cry04_1:: db ( $80 | CH4 ) dw SFX_Cry04_1_Ch1 db CH5 @@ -117,7 +117,7 @@ SFX_Cry04_1:: ; 8060 (2:4060) db CH7 dw SFX_Cry04_1_Ch3 -SFX_Cry05_1:: ; 8069 (2:4069) +SFX_Cry05_1:: db ( $80 | CH4 ) dw SFX_Cry05_1_Ch1 db CH5 @@ -125,7 +125,7 @@ SFX_Cry05_1:: ; 8069 (2:4069) db CH7 dw SFX_Cry05_1_Ch3 -SFX_Cry06_1:: ; 8072 (2:4072) +SFX_Cry06_1:: db ( $80 | CH4 ) dw SFX_Cry06_1_Ch1 db CH5 @@ -133,7 +133,7 @@ SFX_Cry06_1:: ; 8072 (2:4072) db CH7 dw SFX_Cry06_1_Ch3 -SFX_Cry07_1:: ; 807b (2:407b) +SFX_Cry07_1:: db ( $80 | CH4 ) dw SFX_Cry07_1_Ch1 db CH5 @@ -141,7 +141,7 @@ SFX_Cry07_1:: ; 807b (2:407b) db CH7 dw SFX_Cry07_1_Ch3 -SFX_Cry08_1:: ; 8084 (2:4084) +SFX_Cry08_1:: db ( $80 | CH4 ) dw SFX_Cry08_1_Ch1 db CH5 @@ -149,7 +149,7 @@ SFX_Cry08_1:: ; 8084 (2:4084) db CH7 dw SFX_Cry08_1_Ch3 -SFX_Cry09_1:: ; 808d (2:408d) +SFX_Cry09_1:: db ( $80 | CH4 ) dw SFX_Cry09_1_Ch1 db CH5 @@ -157,7 +157,7 @@ SFX_Cry09_1:: ; 808d (2:408d) db CH7 dw SFX_Cry09_1_Ch3 -SFX_Cry0A_1:: ; 8096 (2:4096) +SFX_Cry0A_1:: db ( $80 | CH4 ) dw SFX_Cry0A_1_Ch1 db CH5 @@ -165,7 +165,7 @@ SFX_Cry0A_1:: ; 8096 (2:4096) db CH7 dw SFX_Cry0A_1_Ch3 -SFX_Cry0B_1:: ; 809f (2:409f) +SFX_Cry0B_1:: db ( $80 | CH4 ) dw SFX_Cry0B_1_Ch1 db CH5 @@ -173,7 +173,7 @@ SFX_Cry0B_1:: ; 809f (2:409f) db CH7 dw SFX_Cry0B_1_Ch3 -SFX_Cry0C_1:: ; 80a8 (2:40a8) +SFX_Cry0C_1:: db ( $80 | CH4 ) dw SFX_Cry0C_1_Ch1 db CH5 @@ -181,7 +181,7 @@ SFX_Cry0C_1:: ; 80a8 (2:40a8) db CH7 dw SFX_Cry0C_1_Ch3 -SFX_Cry0D_1:: ; 80b1 (2:40b1) +SFX_Cry0D_1:: db ( $80 | CH4 ) dw SFX_Cry0D_1_Ch1 db CH5 @@ -189,7 +189,7 @@ SFX_Cry0D_1:: ; 80b1 (2:40b1) db CH7 dw SFX_Cry0D_1_Ch3 -SFX_Cry0E_1:: ; 80ba (2:40ba) +SFX_Cry0E_1:: db ( $80 | CH4 ) dw SFX_Cry0E_1_Ch1 db CH5 @@ -197,7 +197,7 @@ SFX_Cry0E_1:: ; 80ba (2:40ba) db CH7 dw SFX_Cry0E_1_Ch3 -SFX_Cry0F_1:: ; 80c3 (2:40c3) +SFX_Cry0F_1:: db ( $80 | CH4 ) dw SFX_Cry0F_1_Ch1 db CH5 @@ -205,7 +205,7 @@ SFX_Cry0F_1:: ; 80c3 (2:40c3) db CH7 dw SFX_Cry0F_1_Ch3 -SFX_Cry10_1:: ; 80cc (2:40cc) +SFX_Cry10_1:: db ( $80 | CH4 ) dw SFX_Cry10_1_Ch1 db CH5 @@ -213,7 +213,7 @@ SFX_Cry10_1:: ; 80cc (2:40cc) db CH7 dw SFX_Cry10_1_Ch3 -SFX_Cry11_1:: ; 80d5 (2:40d5) +SFX_Cry11_1:: db ( $80 | CH4 ) dw SFX_Cry11_1_Ch1 db CH5 @@ -221,7 +221,7 @@ SFX_Cry11_1:: ; 80d5 (2:40d5) db CH7 dw SFX_Cry11_1_Ch3 -SFX_Cry12_1:: ; 80de (2:40de) +SFX_Cry12_1:: db ( $80 | CH4 ) dw SFX_Cry12_1_Ch1 db CH5 @@ -229,7 +229,7 @@ SFX_Cry12_1:: ; 80de (2:40de) db CH7 dw SFX_Cry12_1_Ch3 -SFX_Cry13_1:: ; 80e7 (2:40e7) +SFX_Cry13_1:: db ( $80 | CH4 ) dw SFX_Cry13_1_Ch1 db CH5 @@ -237,7 +237,7 @@ SFX_Cry13_1:: ; 80e7 (2:40e7) db CH7 dw SFX_Cry13_1_Ch3 -SFX_Cry14_1:: ; 80f0 (2:40f0) +SFX_Cry14_1:: db ( $80 | CH4 ) dw SFX_Cry14_1_Ch1 db CH5 @@ -245,7 +245,7 @@ SFX_Cry14_1:: ; 80f0 (2:40f0) db CH7 dw SFX_Cry14_1_Ch3 -SFX_Cry15_1:: ; 80f9 (2:40f9) +SFX_Cry15_1:: db ( $80 | CH4 ) dw SFX_Cry15_1_Ch1 db CH5 @@ -253,7 +253,7 @@ SFX_Cry15_1:: ; 80f9 (2:40f9) db CH7 dw SFX_Cry15_1_Ch3 -SFX_Cry16_1:: ; 8102 (2:4102) +SFX_Cry16_1:: db ( $80 | CH4 ) dw SFX_Cry16_1_Ch1 db CH5 @@ -261,7 +261,7 @@ SFX_Cry16_1:: ; 8102 (2:4102) db CH7 dw SFX_Cry16_1_Ch3 -SFX_Cry17_1:: ; 810b (2:410b) +SFX_Cry17_1:: db ( $80 | CH4 ) dw SFX_Cry17_1_Ch1 db CH5 @@ -269,7 +269,7 @@ SFX_Cry17_1:: ; 810b (2:410b) db CH7 dw SFX_Cry17_1_Ch3 -SFX_Cry18_1:: ; 8114 (2:4114) +SFX_Cry18_1:: db ( $80 | CH4 ) dw SFX_Cry18_1_Ch1 db CH5 @@ -277,7 +277,7 @@ SFX_Cry18_1:: ; 8114 (2:4114) db CH7 dw SFX_Cry18_1_Ch3 -SFX_Cry19_1:: ; 811d (2:411d) +SFX_Cry19_1:: db ( $80 | CH4 ) dw SFX_Cry19_1_Ch1 db CH5 @@ -285,7 +285,7 @@ SFX_Cry19_1:: ; 811d (2:411d) db CH7 dw SFX_Cry19_1_Ch3 -SFX_Cry1A_1:: ; 8126 (2:4126) +SFX_Cry1A_1:: db ( $80 | CH4 ) dw SFX_Cry1A_1_Ch1 db CH5 @@ -293,7 +293,7 @@ SFX_Cry1A_1:: ; 8126 (2:4126) db CH7 dw SFX_Cry1A_1_Ch3 -SFX_Cry1B_1:: ; 812f (2:412f) +SFX_Cry1B_1:: db ( $80 | CH4 ) dw SFX_Cry1B_1_Ch1 db CH5 @@ -301,7 +301,7 @@ SFX_Cry1B_1:: ; 812f (2:412f) db CH7 dw SFX_Cry1B_1_Ch3 -SFX_Cry1C_1:: ; 8138 (2:4138) +SFX_Cry1C_1:: db ( $80 | CH4 ) dw SFX_Cry1C_1_Ch1 db CH5 @@ -309,7 +309,7 @@ SFX_Cry1C_1:: ; 8138 (2:4138) db CH7 dw SFX_Cry1C_1_Ch3 -SFX_Cry1D_1:: ; 8141 (2:4141) +SFX_Cry1D_1:: db ( $80 | CH4 ) dw SFX_Cry1D_1_Ch1 db CH5 @@ -317,7 +317,7 @@ SFX_Cry1D_1:: ; 8141 (2:4141) db CH7 dw SFX_Cry1D_1_Ch3 -SFX_Cry1E_1:: ; 814a (2:414a) +SFX_Cry1E_1:: db ( $80 | CH4 ) dw SFX_Cry1E_1_Ch1 db CH5 @@ -325,7 +325,7 @@ SFX_Cry1E_1:: ; 814a (2:414a) db CH7 dw SFX_Cry1E_1_Ch3 -SFX_Cry1F_1:: ; 8153 (2:4153) +SFX_Cry1F_1:: db ( $80 | CH4 ) dw SFX_Cry1F_1_Ch1 db CH5 @@ -333,7 +333,7 @@ SFX_Cry1F_1:: ; 8153 (2:4153) db CH7 dw SFX_Cry1F_1_Ch3 -SFX_Cry20_1:: ; 815c (2:415c) +SFX_Cry20_1:: db ( $80 | CH4 ) dw SFX_Cry20_1_Ch1 db CH5 @@ -341,7 +341,7 @@ SFX_Cry20_1:: ; 815c (2:415c) db CH7 dw SFX_Cry20_1_Ch3 -SFX_Cry21_1:: ; 8165 (2:4165) +SFX_Cry21_1:: db ( $80 | CH4 ) dw SFX_Cry21_1_Ch1 db CH5 @@ -349,7 +349,7 @@ SFX_Cry21_1:: ; 8165 (2:4165) db CH7 dw SFX_Cry21_1_Ch3 -SFX_Cry22_1:: ; 816e (2:416e) +SFX_Cry22_1:: db ( $80 | CH4 ) dw SFX_Cry22_1_Ch1 db CH5 @@ -357,7 +357,7 @@ SFX_Cry22_1:: ; 816e (2:416e) db CH7 dw SFX_Cry22_1_Ch3 -SFX_Cry23_1:: ; 8177 (2:4177) +SFX_Cry23_1:: db ( $80 | CH4 ) dw SFX_Cry23_1_Ch1 db CH5 @@ -365,7 +365,7 @@ SFX_Cry23_1:: ; 8177 (2:4177) db CH7 dw SFX_Cry23_1_Ch3 -SFX_Cry24_1:: ; 8180 (2:4180) +SFX_Cry24_1:: db ( $80 | CH4 ) dw SFX_Cry24_1_Ch1 db CH5 @@ -373,7 +373,7 @@ SFX_Cry24_1:: ; 8180 (2:4180) db CH7 dw SFX_Cry24_1_Ch3 -SFX_Cry25_1:: ; 8189 (2:4189) +SFX_Cry25_1:: db ( $80 | CH4 ) dw SFX_Cry25_1_Ch1 db CH5 @@ -381,7 +381,7 @@ SFX_Cry25_1:: ; 8189 (2:4189) db CH7 dw SFX_Cry25_1_Ch3 -SFX_Get_Item1_1:: ; 8192 (2:4192) +SFX_Get_Item1_1:: db ( $80 | CH4 ) dw SFX_Get_Item1_1_Ch1 db CH5 @@ -389,7 +389,7 @@ SFX_Get_Item1_1:: ; 8192 (2:4192) db CH6 dw SFX_Get_Item1_1_Ch3 -SFX_Get_Item2_1:: ; 819b (2:419b) +SFX_Get_Item2_1:: db ( $80 | CH4 ) dw SFX_Get_Item2_1_Ch1 db CH5 @@ -397,27 +397,27 @@ SFX_Get_Item2_1:: ; 819b (2:419b) db CH6 dw SFX_Get_Item2_1_Ch3 -SFX_Tink_1:: ; 81a4 (2:41a4) +SFX_Tink_1:: db CH4 dw SFX_Tink_1_Ch1 -SFX_Heal_HP_1:: ; 81a7 (2:41a7) +SFX_Heal_HP_1:: db CH4 dw SFX_Heal_HP_1_Ch1 -SFX_Heal_Ailment_1:: ; 81aa (2:41aa) +SFX_Heal_Ailment_1:: db CH4 dw SFX_Heal_Ailment_1_Ch1 -SFX_Start_Menu_1:: ; 81ad (2:41ad) +SFX_Start_Menu_1:: db CH7 dw SFX_Start_Menu_1_Ch1 -SFX_Press_AB_1:: ; 81b0 (2:41b0) +SFX_Press_AB_1:: db CH4 dw SFX_Press_AB_1_Ch1 -SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3) +SFX_Pokedex_Rating_1:: db ( $80 | CH4 ) dw SFX_Pokedex_Rating_1_Ch1 db CH5 @@ -425,7 +425,7 @@ SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3) db CH6 dw SFX_Pokedex_Rating_1_Ch3 -SFX_Get_Key_Item_1:: ; 81bc (2:41bc) +SFX_Get_Key_Item_1:: db ( $80 | CH4 ) dw SFX_Get_Key_Item_1_Ch1 db CH5 @@ -433,130 +433,130 @@ SFX_Get_Key_Item_1:: ; 81bc (2:41bc) db CH6 dw SFX_Get_Key_Item_1_Ch3 -SFX_Poisoned_1:: ; 81c5 (2:41c5) +SFX_Poisoned_1:: db CH4 dw SFX_Poisoned_1_Ch1 -SFX_Trade_Machine_1:: ; 81c8 (2:41c8) +SFX_Trade_Machine_1:: db CH4 dw SFX_Trade_Machine_1_Ch1 -SFX_Turn_On_PC_1:: ; 81cb (2:41cb) +SFX_Turn_On_PC_1:: db CH4 dw SFX_Turn_On_PC_1_Ch1 -SFX_Turn_Off_PC_1:: ; 81ce (2:41ce) +SFX_Turn_Off_PC_1:: db CH4 dw SFX_Turn_Off_PC_1_Ch1 -SFX_Enter_PC_1:: ; 81d1 (2:41d1) +SFX_Enter_PC_1:: db CH4 dw SFX_Enter_PC_1_Ch1 -SFX_Shrink_1:: ; 81d4 (2:41d4) +SFX_Shrink_1:: db CH4 dw SFX_Shrink_1_Ch1 -SFX_Switch_1:: ; 81d7 (2:41d7) +SFX_Switch_1:: db CH4 dw SFX_Switch_1_Ch1 -SFX_Healing_Machine_1:: ; 81da (2:41da) +SFX_Healing_Machine_1:: db CH4 dw SFX_Healing_Machine_1_Ch1 -SFX_Teleport_Exit1_1:: ; 81dd (2:41dd) +SFX_Teleport_Exit1_1:: db CH4 dw SFX_Teleport_Exit1_1_Ch1 -SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0) +SFX_Teleport_Enter1_1:: db CH4 dw SFX_Teleport_Enter1_1_Ch1 -SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3) +SFX_Teleport_Exit2_1:: db CH4 dw SFX_Teleport_Exit2_1_Ch1 -SFX_Ledge_1:: ; 81e6 (2:41e6) +SFX_Ledge_1:: db CH4 dw SFX_Ledge_1_Ch1 -SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9) +SFX_Teleport_Enter2_1:: db CH7 dw SFX_Teleport_Enter2_1_Ch1 -SFX_Fly_1:: ; 81ec (2:41ec) +SFX_Fly_1:: db CH7 dw SFX_Fly_1_Ch1 -SFX_Denied_1:: ; 81ef (2:41ef) +SFX_Denied_1:: db ( $40 | CH4 ) dw SFX_Denied_1_Ch1 db CH5 dw SFX_Denied_1_Ch2 -SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5) +SFX_Arrow_Tiles_1:: db CH4 dw SFX_Arrow_Tiles_1_Ch1 -SFX_Push_Boulder_1:: ; 81f8 (2:41f8) +SFX_Push_Boulder_1:: db CH7 dw SFX_Push_Boulder_1_Ch1 -SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb) +SFX_SS_Anne_Horn_1:: db ( $40 | CH4 ) dw SFX_SS_Anne_Horn_1_Ch1 db CH5 dw SFX_SS_Anne_Horn_1_Ch2 -SFX_Withdraw_Deposit_1:: ; 8201 (2:4201) +SFX_Withdraw_Deposit_1:: db CH4 dw SFX_Withdraw_Deposit_1_Ch1 -SFX_Cut_1:: ; 8204 (2:4204) +SFX_Cut_1:: db CH7 dw SFX_Cut_1_Ch1 -SFX_Go_Inside_1:: ; 8207 (2:4207) +SFX_Go_Inside_1:: db CH7 dw SFX_Go_Inside_1_Ch1 -SFX_Swap_1:: ; 820a (2:420a) +SFX_Swap_1:: db ( $40 | CH4 ) dw SFX_Swap_1_Ch1 db CH5 dw SFX_Swap_1_Ch2 -SFX_59_1:: ; 8210 (2:4210) +SFX_59_1:: db ( $40 | CH4 ) dw SFX_59_1_Ch1 db CH5 dw SFX_59_1_Ch2 -SFX_Purchase_1:: ; 8216 (2:4216) +SFX_Purchase_1:: db ( $40 | CH4 ) dw SFX_Purchase_1_Ch1 db CH5 dw SFX_Purchase_1_Ch2 -SFX_Collision_1:: ; 821c (2:421c) +SFX_Collision_1:: db CH4 dw SFX_Collision_1_Ch1 -SFX_Go_Outside_1:: ; 821f (2:421f) +SFX_Go_Outside_1:: db CH7 dw SFX_Go_Outside_1_Ch1 -SFX_Save_1:: ; 8222 (2:4222) +SFX_Save_1:: db ( $40 | CH4 ) dw SFX_Save_1_Ch1 db CH5 dw SFX_Save_1_Ch2 -SFX_Pokeflute:: ; 8228 (2:4228) +SFX_Pokeflute:: db CH2 dw SFX_Pokeflute_Ch1 -SFX_Safari_Zone_PA:: ; 822b (2:422b) +SFX_Safari_Zone_PA:: db CH4 dw SFX_Safari_Zone_PA_Ch1 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 1b30f5cc..1b6f8a5c 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,83 +1,83 @@ SFX_Headers_2:: db $ff, $ff, $ff ; padding -SFX_Snare1_2:: ; 20003 (8:4003) +SFX_Snare1_2:: db CH7 dw SFX_Snare1_2_Ch1 -SFX_Snare2_2:: ; 20006 (8:4006) +SFX_Snare2_2:: db CH7 dw SFX_Snare2_2_Ch1 -SFX_Snare3_2:: ; 20009 (8:4009) +SFX_Snare3_2:: db CH7 dw SFX_Snare3_2_Ch1 -SFX_Snare4_2:: ; 2000c (8:400c) +SFX_Snare4_2:: db CH7 dw SFX_Snare4_2_Ch1 -SFX_Snare5_2:: ; 2000f (8:400f) +SFX_Snare5_2:: db CH7 dw SFX_Snare5_2_Ch1 -SFX_Triangle1_2:: ; 20012 (8:4012) +SFX_Triangle1_2:: db CH7 dw SFX_Triangle1_2_Ch1 -SFX_Triangle2_2:: ; 20015 (8:4015) +SFX_Triangle2_2:: db CH7 dw SFX_Triangle2_2_Ch1 -SFX_Snare6_2:: ; 20018 (8:4018) +SFX_Snare6_2:: db CH7 dw SFX_Snare6_2_Ch1 -SFX_Snare7_2:: ; 2001b (8:401b) +SFX_Snare7_2:: db CH7 dw SFX_Snare7_2_Ch1 -SFX_Snare8_2:: ; 2001e (8:401e) +SFX_Snare8_2:: db CH7 dw SFX_Snare8_2_Ch1 -SFX_Snare9_2:: ; 20021 (8:4021) +SFX_Snare9_2:: db CH7 dw SFX_Snare9_2_Ch1 -SFX_Cymbal1_2:: ; 20024 (8:4024) +SFX_Cymbal1_2:: db CH7 dw SFX_Cymbal1_2_Ch1 -SFX_Cymbal2_2:: ; 20027 (8:4027) +SFX_Cymbal2_2:: db CH7 dw SFX_Cymbal2_2_Ch1 -SFX_Cymbal3_2:: ; 2002a (8:402a) +SFX_Cymbal3_2:: db CH7 dw SFX_Cymbal3_2_Ch1 -SFX_Muted_Snare1_2:: ; 2002d (8:402d) +SFX_Muted_Snare1_2:: db CH7 dw SFX_Muted_Snare1_2_Ch1 -SFX_Triangle3_2:: ; 20030 (8:4030) +SFX_Triangle3_2:: db CH7 dw SFX_Triangle3_2_Ch1 -SFX_Muted_Snare2_2:: ; 20033 (8:4033) +SFX_Muted_Snare2_2:: db CH7 dw SFX_Muted_Snare2_2_Ch1 -SFX_Muted_Snare3_2:: ; 20036 (8:4036) +SFX_Muted_Snare3_2:: db CH7 dw SFX_Muted_Snare3_2_Ch1 -SFX_Muted_Snare4_2:: ; 20039 (8:4039) +SFX_Muted_Snare4_2:: db CH7 dw SFX_Muted_Snare4_2_Ch1 -SFX_Cry00_2:: ; 2003c (8:403c) +SFX_Cry00_2:: db ( $80 | CH4 ) dw SFX_Cry00_2_Ch1 db CH5 @@ -85,7 +85,7 @@ SFX_Cry00_2:: ; 2003c (8:403c) db CH7 dw SFX_Cry00_2_Ch3 -SFX_Cry01_2:: ; 20045 (8:4045) +SFX_Cry01_2:: db ( $80 | CH4 ) dw SFX_Cry01_2_Ch1 db CH5 @@ -93,7 +93,7 @@ SFX_Cry01_2:: ; 20045 (8:4045) db CH7 dw SFX_Cry01_2_Ch3 -SFX_Cry02_2:: ; 2004e (8:404e) +SFX_Cry02_2:: db ( $80 | CH4 ) dw SFX_Cry02_2_Ch1 db CH5 @@ -101,7 +101,7 @@ SFX_Cry02_2:: ; 2004e (8:404e) db CH7 dw SFX_Cry02_2_Ch3 -SFX_Cry03_2:: ; 20057 (8:4057) +SFX_Cry03_2:: db ( $80 | CH4 ) dw SFX_Cry03_2_Ch1 db CH5 @@ -109,7 +109,7 @@ SFX_Cry03_2:: ; 20057 (8:4057) db CH7 dw SFX_Cry03_2_Ch3 -SFX_Cry04_2:: ; 20060 (8:4060) +SFX_Cry04_2:: db ( $80 | CH4 ) dw SFX_Cry04_2_Ch1 db CH5 @@ -117,7 +117,7 @@ SFX_Cry04_2:: ; 20060 (8:4060) db CH7 dw SFX_Cry04_2_Ch3 -SFX_Cry05_2:: ; 20069 (8:4069) +SFX_Cry05_2:: db ( $80 | CH4 ) dw SFX_Cry05_2_Ch1 db CH5 @@ -125,7 +125,7 @@ SFX_Cry05_2:: ; 20069 (8:4069) db CH7 dw SFX_Cry05_2_Ch3 -SFX_Cry06_2:: ; 20072 (8:4072) +SFX_Cry06_2:: db ( $80 | CH4 ) dw SFX_Cry06_2_Ch1 db CH5 @@ -133,7 +133,7 @@ SFX_Cry06_2:: ; 20072 (8:4072) db CH7 dw SFX_Cry06_2_Ch3 -SFX_Cry07_2:: ; 2007b (8:407b) +SFX_Cry07_2:: db ( $80 | CH4 ) dw SFX_Cry07_2_Ch1 db CH5 @@ -141,7 +141,7 @@ SFX_Cry07_2:: ; 2007b (8:407b) db CH7 dw SFX_Cry07_2_Ch3 -SFX_Cry08_2:: ; 20084 (8:4084) +SFX_Cry08_2:: db ( $80 | CH4 ) dw SFX_Cry08_2_Ch1 db CH5 @@ -149,7 +149,7 @@ SFX_Cry08_2:: ; 20084 (8:4084) db CH7 dw SFX_Cry08_2_Ch3 -SFX_Cry09_2:: ; 2008d (8:408d) +SFX_Cry09_2:: db ( $80 | CH4 ) dw SFX_Cry09_2_Ch1 db CH5 @@ -157,7 +157,7 @@ SFX_Cry09_2:: ; 2008d (8:408d) db CH7 dw SFX_Cry09_2_Ch3 -SFX_Cry0A_2:: ; 20096 (8:4096) +SFX_Cry0A_2:: db ( $80 | CH4 ) dw SFX_Cry0A_2_Ch1 db CH5 @@ -165,7 +165,7 @@ SFX_Cry0A_2:: ; 20096 (8:4096) db CH7 dw SFX_Cry0A_2_Ch3 -SFX_Cry0B_2:: ; 2009f (8:409f) +SFX_Cry0B_2:: db ( $80 | CH4 ) dw SFX_Cry0B_2_Ch1 db CH5 @@ -173,7 +173,7 @@ SFX_Cry0B_2:: ; 2009f (8:409f) db CH7 dw SFX_Cry0B_2_Ch3 -SFX_Cry0C_2:: ; 200a8 (8:40a8) +SFX_Cry0C_2:: db ( $80 | CH4 ) dw SFX_Cry0C_2_Ch1 db CH5 @@ -181,7 +181,7 @@ SFX_Cry0C_2:: ; 200a8 (8:40a8) db CH7 dw SFX_Cry0C_2_Ch3 -SFX_Cry0D_2:: ; 200b1 (8:40b1) +SFX_Cry0D_2:: db ( $80 | CH4 ) dw SFX_Cry0D_2_Ch1 db CH5 @@ -189,7 +189,7 @@ SFX_Cry0D_2:: ; 200b1 (8:40b1) db CH7 dw SFX_Cry0D_2_Ch3 -SFX_Cry0E_2:: ; 200ba (8:40ba) +SFX_Cry0E_2:: db ( $80 | CH4 ) dw SFX_Cry0E_2_Ch1 db CH5 @@ -197,7 +197,7 @@ SFX_Cry0E_2:: ; 200ba (8:40ba) db CH7 dw SFX_Cry0E_2_Ch3 -SFX_Cry0F_2:: ; 200c3 (8:40c3) +SFX_Cry0F_2:: db ( $80 | CH4 ) dw SFX_Cry0F_2_Ch1 db CH5 @@ -205,7 +205,7 @@ SFX_Cry0F_2:: ; 200c3 (8:40c3) db CH7 dw SFX_Cry0F_2_Ch3 -SFX_Cry10_2:: ; 200cc (8:40cc) +SFX_Cry10_2:: db ( $80 | CH4 ) dw SFX_Cry10_2_Ch1 db CH5 @@ -213,7 +213,7 @@ SFX_Cry10_2:: ; 200cc (8:40cc) db CH7 dw SFX_Cry10_2_Ch3 -SFX_Cry11_2:: ; 200d5 (8:40d5) +SFX_Cry11_2:: db ( $80 | CH4 ) dw SFX_Cry11_2_Ch1 db CH5 @@ -221,7 +221,7 @@ SFX_Cry11_2:: ; 200d5 (8:40d5) db CH7 dw SFX_Cry11_2_Ch3 -SFX_Cry12_2:: ; 200de (8:40de) +SFX_Cry12_2:: db ( $80 | CH4 ) dw SFX_Cry12_2_Ch1 db CH5 @@ -229,7 +229,7 @@ SFX_Cry12_2:: ; 200de (8:40de) db CH7 dw SFX_Cry12_2_Ch3 -SFX_Cry13_2:: ; 200e7 (8:40e7) +SFX_Cry13_2:: db ( $80 | CH4 ) dw SFX_Cry13_2_Ch1 db CH5 @@ -237,7 +237,7 @@ SFX_Cry13_2:: ; 200e7 (8:40e7) db CH7 dw SFX_Cry13_2_Ch3 -SFX_Cry14_2:: ; 200f0 (8:40f0) +SFX_Cry14_2:: db ( $80 | CH4 ) dw SFX_Cry14_2_Ch1 db CH5 @@ -245,7 +245,7 @@ SFX_Cry14_2:: ; 200f0 (8:40f0) db CH7 dw SFX_Cry14_2_Ch3 -SFX_Cry15_2:: ; 200f9 (8:40f9) +SFX_Cry15_2:: db ( $80 | CH4 ) dw SFX_Cry15_2_Ch1 db CH5 @@ -253,7 +253,7 @@ SFX_Cry15_2:: ; 200f9 (8:40f9) db CH7 dw SFX_Cry15_2_Ch3 -SFX_Cry16_2:: ; 20102 (8:4102) +SFX_Cry16_2:: db ( $80 | CH4 ) dw SFX_Cry16_2_Ch1 db CH5 @@ -261,7 +261,7 @@ SFX_Cry16_2:: ; 20102 (8:4102) db CH7 dw SFX_Cry16_2_Ch3 -SFX_Cry17_2:: ; 2010b (8:410b) +SFX_Cry17_2:: db ( $80 | CH4 ) dw SFX_Cry17_2_Ch1 db CH5 @@ -269,7 +269,7 @@ SFX_Cry17_2:: ; 2010b (8:410b) db CH7 dw SFX_Cry17_2_Ch3 -SFX_Cry18_2:: ; 20114 (8:4114) +SFX_Cry18_2:: db ( $80 | CH4 ) dw SFX_Cry18_2_Ch1 db CH5 @@ -277,7 +277,7 @@ SFX_Cry18_2:: ; 20114 (8:4114) db CH7 dw SFX_Cry18_2_Ch3 -SFX_Cry19_2:: ; 2011d (8:411d) +SFX_Cry19_2:: db ( $80 | CH4 ) dw SFX_Cry19_2_Ch1 db CH5 @@ -285,7 +285,7 @@ SFX_Cry19_2:: ; 2011d (8:411d) db CH7 dw SFX_Cry19_2_Ch3 -SFX_Cry1A_2:: ; 20126 (8:4126) +SFX_Cry1A_2:: db ( $80 | CH4 ) dw SFX_Cry1A_2_Ch1 db CH5 @@ -293,7 +293,7 @@ SFX_Cry1A_2:: ; 20126 (8:4126) db CH7 dw SFX_Cry1A_2_Ch3 -SFX_Cry1B_2:: ; 2012f (8:412f) +SFX_Cry1B_2:: db ( $80 | CH4 ) dw SFX_Cry1B_2_Ch1 db CH5 @@ -301,7 +301,7 @@ SFX_Cry1B_2:: ; 2012f (8:412f) db CH7 dw SFX_Cry1B_2_Ch3 -SFX_Cry1C_2:: ; 20138 (8:4138) +SFX_Cry1C_2:: db ( $80 | CH4 ) dw SFX_Cry1C_2_Ch1 db CH5 @@ -309,7 +309,7 @@ SFX_Cry1C_2:: ; 20138 (8:4138) db CH7 dw SFX_Cry1C_2_Ch3 -SFX_Cry1D_2:: ; 20141 (8:4141) +SFX_Cry1D_2:: db ( $80 | CH4 ) dw SFX_Cry1D_2_Ch1 db CH5 @@ -317,7 +317,7 @@ SFX_Cry1D_2:: ; 20141 (8:4141) db CH7 dw SFX_Cry1D_2_Ch3 -SFX_Cry1E_2:: ; 2014a (8:414a) +SFX_Cry1E_2:: db ( $80 | CH4 ) dw SFX_Cry1E_2_Ch1 db CH5 @@ -325,7 +325,7 @@ SFX_Cry1E_2:: ; 2014a (8:414a) db CH7 dw SFX_Cry1E_2_Ch3 -SFX_Cry1F_2:: ; 20153 (8:4153) +SFX_Cry1F_2:: db ( $80 | CH4 ) dw SFX_Cry1F_2_Ch1 db CH5 @@ -333,7 +333,7 @@ SFX_Cry1F_2:: ; 20153 (8:4153) db CH7 dw SFX_Cry1F_2_Ch3 -SFX_Cry20_2:: ; 2015c (8:415c) +SFX_Cry20_2:: db ( $80 | CH4 ) dw SFX_Cry20_2_Ch1 db CH5 @@ -341,7 +341,7 @@ SFX_Cry20_2:: ; 2015c (8:415c) db CH7 dw SFX_Cry20_2_Ch3 -SFX_Cry21_2:: ; 20165 (8:4165) +SFX_Cry21_2:: db ( $80 | CH4 ) dw SFX_Cry21_2_Ch1 db CH5 @@ -349,7 +349,7 @@ SFX_Cry21_2:: ; 20165 (8:4165) db CH7 dw SFX_Cry21_2_Ch3 -SFX_Cry22_2:: ; 2016e (8:416e) +SFX_Cry22_2:: db ( $80 | CH4 ) dw SFX_Cry22_2_Ch1 db CH5 @@ -357,7 +357,7 @@ SFX_Cry22_2:: ; 2016e (8:416e) db CH7 dw SFX_Cry22_2_Ch3 -SFX_Cry23_2:: ; 20177 (8:4177) +SFX_Cry23_2:: db ( $80 | CH4 ) dw SFX_Cry23_2_Ch1 db CH5 @@ -365,7 +365,7 @@ SFX_Cry23_2:: ; 20177 (8:4177) db CH7 dw SFX_Cry23_2_Ch3 -SFX_Cry24_2:: ; 20180 (8:4180) +SFX_Cry24_2:: db ( $80 | CH4 ) dw SFX_Cry24_2_Ch1 db CH5 @@ -373,7 +373,7 @@ SFX_Cry24_2:: ; 20180 (8:4180) db CH7 dw SFX_Cry24_2_Ch3 -SFX_Cry25_2:: ; 20189 (8:4189) +SFX_Cry25_2:: db ( $80 | CH4 ) dw SFX_Cry25_2_Ch1 db CH5 @@ -381,7 +381,7 @@ SFX_Cry25_2:: ; 20189 (8:4189) db CH7 dw SFX_Cry25_2_Ch3 -SFX_Level_Up:: ; 20192 (8:4192) +SFX_Level_Up:: db ( $80 | CH4 ) dw SFX_Level_Up_Ch1 db CH5 @@ -389,7 +389,7 @@ SFX_Level_Up:: ; 20192 (8:4192) db CH6 dw SFX_Level_Up_Ch3 -SFX_Get_Item2_2:: ; 2019b (8:419b) +SFX_Get_Item2_2:: db ( $80 | CH4 ) dw SFX_Get_Item2_2_Ch1 db CH5 @@ -397,55 +397,55 @@ SFX_Get_Item2_2:: ; 2019b (8:419b) db CH6 dw SFX_Get_Item2_2_Ch3 -SFX_Tink_2:: ; 201a4 (8:41a4) +SFX_Tink_2:: db CH4 dw SFX_Tink_2_Ch1 -SFX_Heal_HP_2:: ; 201a7 (8:41a7) +SFX_Heal_HP_2:: db CH4 dw SFX_Heal_HP_2_Ch1 -SFX_Heal_Ailment_2:: ; 201aa (8:41aa) +SFX_Heal_Ailment_2:: db CH4 dw SFX_Heal_Ailment_2_Ch1 -SFX_Start_Menu_2:: ; 201ad (8:41ad) +SFX_Start_Menu_2:: db CH7 dw SFX_Start_Menu_2_Ch1 -SFX_Press_AB_2:: ; 201b0 (8:41b0) +SFX_Press_AB_2:: db CH4 dw SFX_Press_AB_2_Ch1 -SFX_Ball_Toss:: ; 201b3 (8:41b3) +SFX_Ball_Toss:: db ( $40 | CH4 ) dw SFX_Ball_Toss_Ch1 db CH5 dw SFX_Ball_Toss_Ch2 -SFX_Ball_Poof:: ; 201b9 (8:41b9) +SFX_Ball_Poof:: db ( $40 | CH4 ) dw SFX_Ball_Poof_Ch1 db CH7 dw SFX_Ball_Poof_Ch2 -SFX_Faint_Thud:: ; 201bf (8:41bf) +SFX_Faint_Thud:: db ( $40 | CH4 ) dw SFX_Faint_Thud_Ch1 db CH7 dw SFX_Faint_Thud_Ch2 -SFX_Run:: ; 201c5 (8:41c5) +SFX_Run:: db CH7 dw SFX_Run_Ch1 -SFX_Dex_Page_Added:: ; 201c8 (8:41c8) +SFX_Dex_Page_Added:: db ( $40 | CH4 ) dw SFX_Dex_Page_Added_Ch1 db CH5 dw SFX_Dex_Page_Added_Ch2 -SFX_Caught_Mon:: ; 201ce (8:41ce) +SFX_Caught_Mon:: db ( $80 | CH4 ) dw SFX_Caught_Mon_Ch1 db CH5 @@ -453,139 +453,139 @@ SFX_Caught_Mon:: ; 201ce (8:41ce) db CH6 dw SFX_Caught_Mon_Ch3 -SFX_Peck:: ; 201d7 (8:41d7) +SFX_Peck:: db CH7 dw SFX_Peck_Ch1 -SFX_Faint_Fall:: ; 201da (8:41da) +SFX_Faint_Fall:: db CH4 dw SFX_Faint_Fall_Ch1 -SFX_Battle_09:: ; 201dd (8:41dd) +SFX_Battle_09:: db CH4 dw SFX_Battle_09_Ch1 -SFX_Pound:: ; 201e0 (8:41e0) +SFX_Pound:: db CH7 dw SFX_Pound_Ch1 -SFX_Battle_0B:: ; 201e3 (8:41e3) +SFX_Battle_0B:: db CH7 dw SFX_Battle_0B_Ch1 -SFX_Battle_0C:: ; 201e6 (8:41e6) +SFX_Battle_0C:: db CH7 dw SFX_Battle_0C_Ch1 -SFX_Battle_0D:: ; 201e9 (8:41e9) +SFX_Battle_0D:: db CH7 dw SFX_Battle_0D_Ch1 -SFX_Battle_0E:: ; 201ec (8:41ec) +SFX_Battle_0E:: db CH7 dw SFX_Battle_0E_Ch1 -SFX_Battle_0F:: ; 201ef (8:41ef) +SFX_Battle_0F:: db CH7 dw SFX_Battle_0F_Ch1 -SFX_Damage:: ; 201f2 (8:41f2) +SFX_Damage:: db CH7 dw SFX_Damage_Ch1 -SFX_Not_Very_Effective:: ; 201f5 (8:41f5) +SFX_Not_Very_Effective:: db CH7 dw SFX_Not_Very_Effective_Ch1 -SFX_Battle_12:: ; 201f8 (8:41f8) +SFX_Battle_12:: db CH7 dw SFX_Battle_12_Ch1 -SFX_Battle_13:: ; 201fb (8:41fb) +SFX_Battle_13:: db CH7 dw SFX_Battle_13_Ch1 -SFX_Battle_14:: ; 201fe (8:41fe) +SFX_Battle_14:: db CH7 dw SFX_Battle_14_Ch1 -SFX_Vine_Whip:: ; 20201 (8:4201) +SFX_Vine_Whip:: db CH7 dw SFX_Vine_Whip_Ch1 -SFX_Battle_16:: ; 20204 (8:4204) +SFX_Battle_16:: db CH7 dw SFX_Battle_16_Ch1 -SFX_Battle_17:: ; 20207 (8:4207) +SFX_Battle_17:: db CH7 dw SFX_Battle_17_Ch1 -SFX_Battle_18:: ; 2020a (8:420a) +SFX_Battle_18:: db CH7 dw SFX_Battle_18_Ch1 -SFX_Battle_19:: ; 2020d (8:420d) +SFX_Battle_19:: db CH7 dw SFX_Battle_19_Ch1 -SFX_Super_Effective:: ; 20210 (8:4210) +SFX_Super_Effective:: db CH7 dw SFX_Super_Effective_Ch1 -SFX_Battle_1B:: ; 20213 (8:4213) +SFX_Battle_1B:: db CH7 dw SFX_Battle_1B_Ch1 -SFX_Battle_1C:: ; 20216 (8:4216) +SFX_Battle_1C:: db CH7 dw SFX_Battle_1C_Ch1 -SFX_Doubleslap:: ; 20219 (8:4219) +SFX_Doubleslap:: db CH7 dw SFX_Doubleslap_Ch1 -SFX_Battle_1E:: ; 2021c (8:421c) +SFX_Battle_1E:: db ( $40 | CH4 ) dw SFX_Battle_1E_Ch1 db CH7 dw SFX_Battle_1E_Ch2 -SFX_Horn_Drill:: ; 20222 (8:4222) +SFX_Horn_Drill:: db CH7 dw SFX_Horn_Drill_Ch1 -SFX_Battle_20:: ; 20225 (8:4225) +SFX_Battle_20:: db CH7 dw SFX_Battle_20_Ch1 -SFX_Battle_21:: ; 20228 (8:4228) +SFX_Battle_21:: db CH7 dw SFX_Battle_21_Ch1 -SFX_Battle_22:: ; 2022b (8:422b) +SFX_Battle_22:: db CH7 dw SFX_Battle_22_Ch1 -SFX_Battle_23:: ; 2022e (8:422e) +SFX_Battle_23:: db CH7 dw SFX_Battle_23_Ch1 -SFX_Battle_24:: ; 20231 (8:4231) +SFX_Battle_24:: db ( $40 | CH4 ) dw SFX_Battle_24_Ch1 db CH7 dw SFX_Battle_24_Ch2 -SFX_Battle_25:: ; 20237 (8:4237) +SFX_Battle_25:: db CH7 dw SFX_Battle_25_Ch1 -SFX_Battle_26:: ; 2023a (8:423a) +SFX_Battle_26:: db CH7 dw SFX_Battle_26_Ch1 -SFX_Battle_27:: ; 2023d (8:423d) +SFX_Battle_27:: db ( $80 | CH4 ) dw SFX_Battle_27_Ch1 db CH5 @@ -593,7 +593,7 @@ SFX_Battle_27:: ; 2023d (8:423d) db CH7 dw SFX_Battle_27_Ch3 -SFX_Battle_28:: ; 20246 (8:4246) +SFX_Battle_28:: db ( $80 | CH4 ) dw SFX_Battle_28_Ch1 db CH5 @@ -601,13 +601,13 @@ SFX_Battle_28:: ; 20246 (8:4246) db CH7 dw SFX_Battle_28_Ch3 -SFX_Battle_29:: ; 2024f (8:424f) +SFX_Battle_29:: db ( $40 | CH4 ) dw SFX_Battle_29_Ch1 db CH7 dw SFX_Battle_29_Ch2 -SFX_Battle_2A:: ; 20255 (8:4255) +SFX_Battle_2A:: db ( $80 | CH4 ) dw SFX_Battle_2A_Ch1 db CH5 @@ -615,13 +615,13 @@ SFX_Battle_2A:: ; 20255 (8:4255) db CH7 dw SFX_Battle_2A_Ch3 -SFX_Battle_2B:: ; 2025e (8:425e) +SFX_Battle_2B:: db ( $40 | CH4 ) dw SFX_Battle_2B_Ch1 db CH7 dw SFX_Battle_2B_Ch2 -SFX_Battle_2C:: ; 20264 (8:4264) +SFX_Battle_2C:: db ( $80 | CH4 ) dw SFX_Battle_2C_Ch1 db CH5 @@ -629,7 +629,7 @@ SFX_Battle_2C:: ; 20264 (8:4264) db CH7 dw SFX_Battle_2C_Ch3 -SFX_Psybeam:: ; 2026d (8:426d) +SFX_Psybeam:: db ( $80 | CH4 ) dw SFX_Psybeam_Ch1 db CH5 @@ -637,7 +637,7 @@ SFX_Psybeam:: ; 2026d (8:426d) db CH7 dw SFX_Psybeam_Ch3 -SFX_Battle_2E:: ; 20276 (8:4276) +SFX_Battle_2E:: db ( $80 | CH4 ) dw SFX_Battle_2E_Ch1 db CH5 @@ -645,7 +645,7 @@ SFX_Battle_2E:: ; 20276 (8:4276) db CH7 dw SFX_Battle_2E_Ch3 -SFX_Battle_2F:: ; 2027f (8:427f) +SFX_Battle_2F:: db ( $80 | CH4 ) dw SFX_Battle_2F_Ch1 db CH5 @@ -653,7 +653,7 @@ SFX_Battle_2F:: ; 2027f (8:427f) db CH7 dw SFX_Battle_2F_Ch3 -SFX_Psychic_M:: ; 20288 (8:4288) +SFX_Psychic_M:: db ( $80 | CH4 ) dw SFX_Psychic_M_Ch1 db CH5 @@ -661,25 +661,25 @@ SFX_Psychic_M:: ; 20288 (8:4288) db CH7 dw SFX_Psychic_M_Ch3 -SFX_Battle_31:: ; 20291 (8:4291) +SFX_Battle_31:: db ( $40 | CH4 ) dw SFX_Battle_31_Ch1 db CH5 dw SFX_Battle_31_Ch2 -SFX_Battle_32:: ; 20297 (8:4297) +SFX_Battle_32:: db ( $40 | CH4 ) dw SFX_Battle_32_Ch1 db CH5 dw SFX_Battle_32_Ch2 -SFX_Battle_33:: ; 2029d (8:429d) +SFX_Battle_33:: db ( $40 | CH4 ) dw SFX_Battle_33_Ch1 db CH5 dw SFX_Battle_33_Ch2 -SFX_Battle_34:: ; 202a3 (8:42a3) +SFX_Battle_34:: db ( $80 | CH4 ) dw SFX_Battle_34_Ch1 db CH5 @@ -687,13 +687,13 @@ SFX_Battle_34:: ; 202a3 (8:42a3) db CH7 dw SFX_Battle_34_Ch3 -SFX_Battle_35:: ; 202ac (8:42ac) +SFX_Battle_35:: db ( $40 | CH4 ) dw SFX_Battle_35_Ch1 db CH5 dw SFX_Battle_35_Ch2 -SFX_Battle_36:: ; 202b2 (8:42b2) +SFX_Battle_36:: db ( $80 | CH4 ) dw SFX_Battle_36_Ch1 db CH5 @@ -701,6 +701,6 @@ SFX_Battle_36:: ; 202b2 (8:42b2) db CH7 dw SFX_Battle_36_Ch3 -SFX_Silph_Scope:: ; 202bb (8:42bb) +SFX_Silph_Scope:: db CH4 dw SFX_Silph_Scope_Ch1 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 321a33f5..0472afa6 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,83 +1,83 @@ SFX_Headers_3:: db $ff, $ff, $ff ; padding -SFX_Snare1_3:: ; 7c003 (1f:4003) +SFX_Snare1_3:: db CH7 dw SFX_Snare1_3_Ch1 -SFX_Snare2_3:: ; 7c006 (1f:4006) +SFX_Snare2_3:: db CH7 dw SFX_Snare2_3_Ch1 -SFX_Snare3_3:: ; 7c009 (1f:4009) +SFX_Snare3_3:: db CH7 dw SFX_Snare3_3_Ch1 -SFX_Snare4_3:: ; 7c00c (1f:400c) +SFX_Snare4_3:: db CH7 dw SFX_Snare4_3_Ch1 -SFX_Snare5_3:: ; 7c00f (1f:400f) +SFX_Snare5_3:: db CH7 dw SFX_Snare5_3_Ch1 -SFX_Triangle1_3:: ; 7c012 (1f:4012) +SFX_Triangle1_3:: db CH7 dw SFX_Triangle1_3_Ch1 -SFX_Triangle2_3:: ; 7c015 (1f:4015) +SFX_Triangle2_3:: db CH7 dw SFX_Triangle2_3_Ch1 -SFX_Snare6_3:: ; 7c018 (1f:4018) +SFX_Snare6_3:: db CH7 dw SFX_Snare6_3_Ch1 -SFX_Snare7_3:: ; 7c01b (1f:401b) +SFX_Snare7_3:: db CH7 dw SFX_Snare7_3_Ch1 -SFX_Snare8_3:: ; 7c01e (1f:401e) +SFX_Snare8_3:: db CH7 dw SFX_Snare8_3_Ch1 -SFX_Snare9_3:: ; 7c021 (1f:4021) +SFX_Snare9_3:: db CH7 dw SFX_Snare9_3_Ch1 -SFX_Cymbal1_3:: ; 7c024 (1f:4024) +SFX_Cymbal1_3:: db CH7 dw SFX_Cymbal1_3_Ch1 -SFX_Cymbal2_3:: ; 7c027 (1f:4027) +SFX_Cymbal2_3:: db CH7 dw SFX_Cymbal2_3_Ch1 -SFX_Cymbal3_3:: ; 7c02a (1f:402a) +SFX_Cymbal3_3:: db CH7 dw SFX_Cymbal3_3_Ch1 -SFX_Muted_Snare1_3:: ; 7c02d (1f:402d) +SFX_Muted_Snare1_3:: db CH7 dw SFX_Muted_Snare1_3_Ch1 -SFX_Triangle3_3:: ; 7c030 (1f:4030) +SFX_Triangle3_3:: db CH7 dw SFX_Triangle3_3_Ch1 -SFX_Muted_Snare2_3:: ; 7c033 (1f:4033) +SFX_Muted_Snare2_3:: db CH7 dw SFX_Muted_Snare2_3_Ch1 -SFX_Muted_Snare3_3:: ; 7c036 (1f:4036) +SFX_Muted_Snare3_3:: db CH7 dw SFX_Muted_Snare3_3_Ch1 -SFX_Muted_Snare4_3:: ; 7c039 (1f:4039) +SFX_Muted_Snare4_3:: db CH7 dw SFX_Muted_Snare4_3_Ch1 -SFX_Cry00_3:: ; 7c03c (1f:403c) +SFX_Cry00_3:: db ( $80 | CH4 ) dw SFX_Cry00_3_Ch1 db CH5 @@ -85,7 +85,7 @@ SFX_Cry00_3:: ; 7c03c (1f:403c) db CH7 dw SFX_Cry00_3_Ch3 -SFX_Cry01_3:: ; 7c045 (1f:4045) +SFX_Cry01_3:: db ( $80 | CH4 ) dw SFX_Cry01_3_Ch1 db CH5 @@ -93,7 +93,7 @@ SFX_Cry01_3:: ; 7c045 (1f:4045) db CH7 dw SFX_Cry01_3_Ch3 -SFX_Cry02_3:: ; 7c04e (1f:404e) +SFX_Cry02_3:: db ( $80 | CH4 ) dw SFX_Cry02_3_Ch1 db CH5 @@ -101,7 +101,7 @@ SFX_Cry02_3:: ; 7c04e (1f:404e) db CH7 dw SFX_Cry02_3_Ch3 -SFX_Cry03_3:: ; 7c057 (1f:4057) +SFX_Cry03_3:: db ( $80 | CH4 ) dw SFX_Cry03_3_Ch1 db CH5 @@ -109,7 +109,7 @@ SFX_Cry03_3:: ; 7c057 (1f:4057) db CH7 dw SFX_Cry03_3_Ch3 -SFX_Cry04_3:: ; 7c060 (1f:4060) +SFX_Cry04_3:: db ( $80 | CH4 ) dw SFX_Cry04_3_Ch1 db CH5 @@ -117,7 +117,7 @@ SFX_Cry04_3:: ; 7c060 (1f:4060) db CH7 dw SFX_Cry04_3_Ch3 -SFX_Cry05_3:: ; 7c069 (1f:4069) +SFX_Cry05_3:: db ( $80 | CH4 ) dw SFX_Cry05_3_Ch1 db CH5 @@ -125,7 +125,7 @@ SFX_Cry05_3:: ; 7c069 (1f:4069) db CH7 dw SFX_Cry05_3_Ch3 -SFX_Cry06_3:: ; 7c072 (1f:4072) +SFX_Cry06_3:: db ( $80 | CH4 ) dw SFX_Cry06_3_Ch1 db CH5 @@ -133,7 +133,7 @@ SFX_Cry06_3:: ; 7c072 (1f:4072) db CH7 dw SFX_Cry06_3_Ch3 -SFX_Cry07_3:: ; 7c07b (1f:407b) +SFX_Cry07_3:: db ( $80 | CH4 ) dw SFX_Cry07_3_Ch1 db CH5 @@ -141,7 +141,7 @@ SFX_Cry07_3:: ; 7c07b (1f:407b) db CH7 dw SFX_Cry07_3_Ch3 -SFX_Cry08_3:: ; 7c084 (1f:4084) +SFX_Cry08_3:: db ( $80 | CH4 ) dw SFX_Cry08_3_Ch1 db CH5 @@ -149,7 +149,7 @@ SFX_Cry08_3:: ; 7c084 (1f:4084) db CH7 dw SFX_Cry08_3_Ch3 -SFX_Cry09_3:: ; 7c08d (1f:408d) +SFX_Cry09_3:: db ( $80 | CH4 ) dw SFX_Cry09_3_Ch1 db CH5 @@ -157,7 +157,7 @@ SFX_Cry09_3:: ; 7c08d (1f:408d) db CH7 dw SFX_Cry09_3_Ch3 -SFX_Cry0A_3:: ; 7c096 (1f:4096) +SFX_Cry0A_3:: db ( $80 | CH4 ) dw SFX_Cry0A_3_Ch1 db CH5 @@ -165,7 +165,7 @@ SFX_Cry0A_3:: ; 7c096 (1f:4096) db CH7 dw SFX_Cry0A_3_Ch3 -SFX_Cry0B_3:: ; 7c09f (1f:409f) +SFX_Cry0B_3:: db ( $80 | CH4 ) dw SFX_Cry0B_3_Ch1 db CH5 @@ -173,7 +173,7 @@ SFX_Cry0B_3:: ; 7c09f (1f:409f) db CH7 dw SFX_Cry0B_3_Ch3 -SFX_Cry0C_3:: ; 7c0a8 (1f:40a8) +SFX_Cry0C_3:: db ( $80 | CH4 ) dw SFX_Cry0C_3_Ch1 db CH5 @@ -181,7 +181,7 @@ SFX_Cry0C_3:: ; 7c0a8 (1f:40a8) db CH7 dw SFX_Cry0C_3_Ch3 -SFX_Cry0D_3:: ; 7c0b1 (1f:40b1) +SFX_Cry0D_3:: db ( $80 | CH4 ) dw SFX_Cry0D_3_Ch1 db CH5 @@ -189,7 +189,7 @@ SFX_Cry0D_3:: ; 7c0b1 (1f:40b1) db CH7 dw SFX_Cry0D_3_Ch3 -SFX_Cry0E_3:: ; 7c0ba (1f:40ba) +SFX_Cry0E_3:: db ( $80 | CH4 ) dw SFX_Cry0E_3_Ch1 db CH5 @@ -197,7 +197,7 @@ SFX_Cry0E_3:: ; 7c0ba (1f:40ba) db CH7 dw SFX_Cry0E_3_Ch3 -SFX_Cry0F_3:: ; 7c0c3 (1f:40c3) +SFX_Cry0F_3:: db ( $80 | CH4 ) dw SFX_Cry0F_3_Ch1 db CH5 @@ -205,7 +205,7 @@ SFX_Cry0F_3:: ; 7c0c3 (1f:40c3) db CH7 dw SFX_Cry0F_3_Ch3 -SFX_Cry10_3:: ; 7c0cc (1f:40cc) +SFX_Cry10_3:: db ( $80 | CH4 ) dw SFX_Cry10_3_Ch1 db CH5 @@ -213,7 +213,7 @@ SFX_Cry10_3:: ; 7c0cc (1f:40cc) db CH7 dw SFX_Cry10_3_Ch3 -SFX_Cry11_3:: ; 7c0d5 (1f:40d5) +SFX_Cry11_3:: db ( $80 | CH4 ) dw SFX_Cry11_3_Ch1 db CH5 @@ -221,7 +221,7 @@ SFX_Cry11_3:: ; 7c0d5 (1f:40d5) db CH7 dw SFX_Cry11_3_Ch3 -SFX_Cry12_3:: ; 7c0de (1f:40de) +SFX_Cry12_3:: db ( $80 | CH4 ) dw SFX_Cry12_3_Ch1 db CH5 @@ -229,7 +229,7 @@ SFX_Cry12_3:: ; 7c0de (1f:40de) db CH7 dw SFX_Cry12_3_Ch3 -SFX_Cry13_3:: ; 7c0e7 (1f:40e7) +SFX_Cry13_3:: db ( $80 | CH4 ) dw SFX_Cry13_3_Ch1 db CH5 @@ -237,7 +237,7 @@ SFX_Cry13_3:: ; 7c0e7 (1f:40e7) db CH7 dw SFX_Cry13_3_Ch3 -SFX_Cry14_3:: ; 7c0f0 (1f:40f0) +SFX_Cry14_3:: db ( $80 | CH4 ) dw SFX_Cry14_3_Ch1 db CH5 @@ -245,7 +245,7 @@ SFX_Cry14_3:: ; 7c0f0 (1f:40f0) db CH7 dw SFX_Cry14_3_Ch3 -SFX_Cry15_3:: ; 7c0f9 (1f:40f9) +SFX_Cry15_3:: db ( $80 | CH4 ) dw SFX_Cry15_3_Ch1 db CH5 @@ -253,7 +253,7 @@ SFX_Cry15_3:: ; 7c0f9 (1f:40f9) db CH7 dw SFX_Cry15_3_Ch3 -SFX_Cry16_3:: ; 7c102 (1f:4102) +SFX_Cry16_3:: db ( $80 | CH4 ) dw SFX_Cry16_3_Ch1 db CH5 @@ -261,7 +261,7 @@ SFX_Cry16_3:: ; 7c102 (1f:4102) db CH7 dw SFX_Cry16_3_Ch3 -SFX_Cry17_3:: ; 7c10b (1f:410b) +SFX_Cry17_3:: db ( $80 | CH4 ) dw SFX_Cry17_3_Ch1 db CH5 @@ -269,7 +269,7 @@ SFX_Cry17_3:: ; 7c10b (1f:410b) db CH7 dw SFX_Cry17_3_Ch3 -SFX_Cry18_3:: ; 7c114 (1f:4114) +SFX_Cry18_3:: db ( $80 | CH4 ) dw SFX_Cry18_3_Ch1 db CH5 @@ -277,7 +277,7 @@ SFX_Cry18_3:: ; 7c114 (1f:4114) db CH7 dw SFX_Cry18_3_Ch3 -SFX_Cry19_3:: ; 7c11d (1f:411d) +SFX_Cry19_3:: db ( $80 | CH4 ) dw SFX_Cry19_3_Ch1 db CH5 @@ -285,7 +285,7 @@ SFX_Cry19_3:: ; 7c11d (1f:411d) db CH7 dw SFX_Cry19_3_Ch3 -SFX_Cry1A_3:: ; 7c126 (1f:4126) +SFX_Cry1A_3:: db ( $80 | CH4 ) dw SFX_Cry1A_3_Ch1 db CH5 @@ -293,7 +293,7 @@ SFX_Cry1A_3:: ; 7c126 (1f:4126) db CH7 dw SFX_Cry1A_3_Ch3 -SFX_Cry1B_3:: ; 7c12f (1f:412f) +SFX_Cry1B_3:: db ( $80 | CH4 ) dw SFX_Cry1B_3_Ch1 db CH5 @@ -301,7 +301,7 @@ SFX_Cry1B_3:: ; 7c12f (1f:412f) db CH7 dw SFX_Cry1B_3_Ch3 -SFX_Cry1C_3:: ; 7c138 (1f:4138) +SFX_Cry1C_3:: db ( $80 | CH4 ) dw SFX_Cry1C_3_Ch1 db CH5 @@ -309,7 +309,7 @@ SFX_Cry1C_3:: ; 7c138 (1f:4138) db CH7 dw SFX_Cry1C_3_Ch3 -SFX_Cry1D_3:: ; 7c141 (1f:4141) +SFX_Cry1D_3:: db ( $80 | CH4 ) dw SFX_Cry1D_3_Ch1 db CH5 @@ -317,7 +317,7 @@ SFX_Cry1D_3:: ; 7c141 (1f:4141) db CH7 dw SFX_Cry1D_3_Ch3 -SFX_Cry1E_3:: ; 7c14a (1f:414a) +SFX_Cry1E_3:: db ( $80 | CH4 ) dw SFX_Cry1E_3_Ch1 db CH5 @@ -325,7 +325,7 @@ SFX_Cry1E_3:: ; 7c14a (1f:414a) db CH7 dw SFX_Cry1E_3_Ch3 -SFX_Cry1F_3:: ; 7c153 (1f:4153) +SFX_Cry1F_3:: db ( $80 | CH4 ) dw SFX_Cry1F_3_Ch1 db CH5 @@ -333,7 +333,7 @@ SFX_Cry1F_3:: ; 7c153 (1f:4153) db CH7 dw SFX_Cry1F_3_Ch3 -SFX_Cry20_3:: ; 7c15c (1f:415c) +SFX_Cry20_3:: db ( $80 | CH4 ) dw SFX_Cry20_3_Ch1 db CH5 @@ -341,7 +341,7 @@ SFX_Cry20_3:: ; 7c15c (1f:415c) db CH7 dw SFX_Cry20_3_Ch3 -SFX_Cry21_3:: ; 7c165 (1f:4165) +SFX_Cry21_3:: db ( $80 | CH4 ) dw SFX_Cry21_3_Ch1 db CH5 @@ -349,7 +349,7 @@ SFX_Cry21_3:: ; 7c165 (1f:4165) db CH7 dw SFX_Cry21_3_Ch3 -SFX_Cry22_3:: ; 7c16e (1f:416e) +SFX_Cry22_3:: db ( $80 | CH4 ) dw SFX_Cry22_3_Ch1 db CH5 @@ -357,7 +357,7 @@ SFX_Cry22_3:: ; 7c16e (1f:416e) db CH7 dw SFX_Cry22_3_Ch3 -SFX_Cry23_3:: ; 7c177 (1f:4177) +SFX_Cry23_3:: db ( $80 | CH4 ) dw SFX_Cry23_3_Ch1 db CH5 @@ -365,7 +365,7 @@ SFX_Cry23_3:: ; 7c177 (1f:4177) db CH7 dw SFX_Cry23_3_Ch3 -SFX_Cry24_3:: ; 7c180 (1f:4180) +SFX_Cry24_3:: db ( $80 | CH4 ) dw SFX_Cry24_3_Ch1 db CH5 @@ -373,7 +373,7 @@ SFX_Cry24_3:: ; 7c180 (1f:4180) db CH7 dw SFX_Cry24_3_Ch3 -SFX_Cry25_3:: ; 7c189 (1f:4189) +SFX_Cry25_3:: db ( $80 | CH4 ) dw SFX_Cry25_3_Ch1 db CH5 @@ -381,7 +381,7 @@ SFX_Cry25_3:: ; 7c189 (1f:4189) db CH7 dw SFX_Cry25_3_Ch3 -SFX_Get_Item1_3:: ; 7c192 (1f:4192) +SFX_Get_Item1_3:: db ( $80 | CH4 ) dw SFX_Get_Item1_3_Ch1 db CH5 @@ -389,7 +389,7 @@ SFX_Get_Item1_3:: ; 7c192 (1f:4192) db CH6 dw SFX_Get_Item1_3_Ch3 -SFX_Get_Item2_3:: ; 7c19b (1f:419b) +SFX_Get_Item2_3:: db ( $80 | CH4 ) dw SFX_Get_Item2_3_Ch1 db CH5 @@ -397,27 +397,27 @@ SFX_Get_Item2_3:: ; 7c19b (1f:419b) db CH6 dw SFX_Get_Item2_3_Ch3 -SFX_Tink_3:: ; 7c1a4 (1f:41a4) +SFX_Tink_3:: db CH4 dw SFX_Tink_3_Ch1 -SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7) +SFX_Heal_HP_3:: db CH4 dw SFX_Heal_HP_3_Ch1 -SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa) +SFX_Heal_Ailment_3:: db CH4 dw SFX_Heal_Ailment_3_Ch1 -SFX_Start_Menu_3:: ; 7c1ad (1f:41ad) +SFX_Start_Menu_3:: db CH7 dw SFX_Start_Menu_3_Ch1 -SFX_Press_AB_3:: ; 7c1b0 (1f:41b0) +SFX_Press_AB_3:: db CH4 dw SFX_Press_AB_3_Ch1 -SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3) +SFX_Pokedex_Rating_3:: db ( $80 | CH4 ) dw SFX_Pokedex_Rating_3_Ch1 db CH5 @@ -425,7 +425,7 @@ SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3) db CH6 dw SFX_Pokedex_Rating_3_Ch3 -SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc) +SFX_Get_Key_Item_3:: db ( $80 | CH4 ) dw SFX_Get_Key_Item_3_Ch1 db CH5 @@ -433,164 +433,164 @@ SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc) db CH6 dw SFX_Get_Key_Item_3_Ch3 -SFX_Poisoned_3:: ; 7c1c5 (1f:41c5) +SFX_Poisoned_3:: db CH4 dw SFX_Poisoned_3_Ch1 -SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8) +SFX_Trade_Machine_3:: db CH4 dw SFX_Trade_Machine_3_Ch1 -SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb) +SFX_Turn_On_PC_3:: db CH4 dw SFX_Turn_On_PC_3_Ch1 -SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce) +SFX_Turn_Off_PC_3:: db CH4 dw SFX_Turn_Off_PC_3_Ch1 -SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1) +SFX_Enter_PC_3:: db CH4 dw SFX_Enter_PC_3_Ch1 -SFX_Shrink_3:: ; 7c1d4 (1f:41d4) +SFX_Shrink_3:: db CH4 dw SFX_Shrink_3_Ch1 -SFX_Switch_3:: ; 7c1d7 (1f:41d7) +SFX_Switch_3:: db CH4 dw SFX_Switch_3_Ch1 -SFX_Healing_Machine_3:: ; 7c1da (1f:41da) +SFX_Healing_Machine_3:: db CH4 dw SFX_Healing_Machine_3_Ch1 -SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd) +SFX_Teleport_Exit1_3:: db CH4 dw SFX_Teleport_Exit1_3_Ch1 -SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0) +SFX_Teleport_Enter1_3:: db CH4 dw SFX_Teleport_Enter1_3_Ch1 -SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3) +SFX_Teleport_Exit2_3:: db CH4 dw SFX_Teleport_Exit2_3_Ch1 -SFX_Ledge_3:: ; 7c1e6 (1f:41e6) +SFX_Ledge_3:: db CH4 dw SFX_Ledge_3_Ch1 -SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9) +SFX_Teleport_Enter2_3:: db CH7 dw SFX_Teleport_Enter2_3_Ch1 -SFX_Fly_3:: ; 7c1ec (1f:41ec) +SFX_Fly_3:: db CH7 dw SFX_Fly_3_Ch1 -SFX_Denied_3:: ; 7c1ef (1f:41ef) +SFX_Denied_3:: db ( $40 | CH4 ) dw SFX_Denied_3_Ch1 db CH5 dw SFX_Denied_3_Ch2 -SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5) +SFX_Arrow_Tiles_3:: db CH4 dw SFX_Arrow_Tiles_3_Ch1 -SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8) +SFX_Push_Boulder_3:: db CH7 dw SFX_Push_Boulder_3_Ch1 -SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb) +SFX_SS_Anne_Horn_3:: db ( $40 | CH4 ) dw SFX_SS_Anne_Horn_3_Ch1 db CH5 dw SFX_SS_Anne_Horn_3_Ch2 -SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201) +SFX_Withdraw_Deposit_3:: db CH4 dw SFX_Withdraw_Deposit_3_Ch1 -SFX_Cut_3:: ; 7c204 (1f:4204) +SFX_Cut_3:: db CH7 dw SFX_Cut_3_Ch1 -SFX_Go_Inside_3:: ; 7c207 (1f:4207) +SFX_Go_Inside_3:: db CH7 dw SFX_Go_Inside_3_Ch1 -SFX_Swap_3:: ; 7c20a (1f:420a) +SFX_Swap_3:: db ( $40 | CH4 ) dw SFX_Swap_3_Ch1 db CH5 dw SFX_Swap_3_Ch2 -SFX_59_3:: ; 7c210 (1f:4210) +SFX_59_3:: db ( $40 | CH4 ) dw SFX_59_3_Ch1 db CH5 dw SFX_59_3_Ch2 -SFX_Purchase_3:: ; 7c216 (1f:4216) +SFX_Purchase_3:: db ( $40 | CH4 ) dw SFX_Purchase_3_Ch1 db CH5 dw SFX_Purchase_3_Ch2 -SFX_Collision_3:: ; 7c21c (1f:421c) +SFX_Collision_3:: db CH4 dw SFX_Collision_3_Ch1 -SFX_Go_Outside_3:: ; 7c21f (1f:421f) +SFX_Go_Outside_3:: db CH7 dw SFX_Go_Outside_3_Ch1 -SFX_Save_3:: ; 7c222 (1f:4222) +SFX_Save_3:: db ( $40 | CH4 ) dw SFX_Save_3_Ch1 db CH5 dw SFX_Save_3_Ch2 -SFX_Intro_Lunge:: ; 7c228 (1f:4228) +SFX_Intro_Lunge:: db CH7 dw SFX_Intro_Lunge_Ch1 -SFX_Intro_Hip:: ; 7c22b (1f:422b) +SFX_Intro_Hip:: db CH4 dw SFX_Intro_Hip_Ch1 -SFX_Intro_Hop:: ; 7c22e (1f:422e) +SFX_Intro_Hop:: db CH4 dw SFX_Intro_Hop_Ch1 -SFX_Intro_Raise:: ; 7c231 (1f:4231) +SFX_Intro_Raise:: db CH7 dw SFX_Intro_Raise_Ch1 -SFX_Intro_Crash:: ; 7c234 (1f:4234) +SFX_Intro_Crash:: db CH7 dw SFX_Intro_Crash_Ch1 -SFX_Intro_Whoosh:: ; 7c237 (1f:4237) +SFX_Intro_Whoosh:: db CH7 dw SFX_Intro_Whoosh_Ch1 -SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a) +SFX_Slots_Stop_Wheel:: db CH4 dw SFX_Slots_Stop_Wheel_Ch1 -SFX_Slots_Reward:: ; 7c23d (1f:423d) +SFX_Slots_Reward:: db CH4 dw SFX_Slots_Reward_Ch1 -SFX_Slots_New_Spin:: ; 7c240 (1f:4240) +SFX_Slots_New_Spin:: db ( $40 | CH4 ) dw SFX_Slots_New_Spin_Ch1 db CH5 dw SFX_Slots_New_Spin_Ch2 -SFX_Shooting_Star:: ; 7c246 (1f:4246) +SFX_Shooting_Star:: db CH4 dw SFX_Shooting_Star_Ch1 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index 6da2f9d6..b5378a94 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,4 +1,4 @@ -Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb) +Music_BikeRiding_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -153,7 +153,7 @@ Music_BikeRiding_branch_7dbc9:: loopchannel 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c) +Music_BikeRiding_Ch2:: duty 2 vibrato 6, 1, 5 notetype 12, 12, 3 @@ -302,7 +302,7 @@ Music_BikeRiding_branch_7dc75:: loopchannel 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14) +Music_BikeRiding_Ch3:: notetype 12, 1, 3 rest 2 @@ -643,7 +643,7 @@ Music_BikeRiding_branch_7dd17:: loopchannel 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch4:: ; 7de68 (1f:5e68) +Music_BikeRiding_Ch4:: dspeed 12 rest 2 diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index 71758fe4..3f015d8d 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,4 +1,4 @@ -Music_Celadon_Ch1:: ; b6c7 (2:76c7) +Music_Celadon_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -107,7 +107,7 @@ Music_Celadon_branch_b6d4:: loopchannel 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch2:: ; b73a (2:773a) +Music_Celadon_Ch2:: duty 3 notetype 12, 12, 2 octave 4 @@ -226,7 +226,7 @@ Music_Celadon_branch_b74a:: loopchannel 0, Music_Celadon_branch_b74a -Music_Celadon_Ch3:: ; b7b5 (2:77b5) +Music_Celadon_Ch3:: notetype 12, 1, 3 rest 8 octave 5 diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index f3a12c5e..4fe93c31 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,4 +1,4 @@ -Music_Cinnabar_Ch1:: ; b86d (2:786d) +Music_Cinnabar_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -85,7 +85,7 @@ Music_Cinnabar_branch_b878:: loopchannel 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch2:: ; b8d4 (2:78d4) +Music_Cinnabar_Ch2:: duty 3 vibrato 10, 2, 3 @@ -179,7 +179,7 @@ Music_Cinnabar_branch_b8d9:: loopchannel 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch3:: ; b93d (2:793d) +Music_Cinnabar_Ch3:: notetype 12, 1, 0 Music_Cinnabar_branch_b93f:: diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index f461ec56..438c2f18 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -1,4 +1,4 @@ -Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f) +Music_CinnabarMansion_Ch1:: tempo 144 volume 7, 7 vibrato 11, 2, 5 @@ -38,7 +38,7 @@ Music_CinnabarMansion_branch_7ed19:: loopchannel 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch2:: ; 7ed40 (1f:6d40) +Music_CinnabarMansion_Ch2:: duty 2 toggleperfectpitch vibrato 10, 2, 4 @@ -95,7 +95,7 @@ Music_CinnabarMansion_branch_7ed6c:: endchannel -Music_CinnabarMansion_Ch3:: ; 7ed7e (1f:6d7e) +Music_CinnabarMansion_Ch3:: notetype 12, 1, 1 Music_CinnabarMansion_branch_7ed80:: @@ -143,7 +143,7 @@ Music_CinnabarMansion_branch_7ed80:: loopchannel 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch4:: ; 7edb0 (1f:6db0) +Music_CinnabarMansion_Ch4:: dspeed 6 rest 16 rest 16 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 4b068045..eb9ccde5 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -2,7 +2,7 @@ Music_Cities1_branch_aa6f:: tempo 232 loopchannel 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch1:: ; aa76 (2:6a76) +Music_Cities1_Ch1:: tempo 144 Music_Cities1_branch_aa79:: @@ -268,7 +268,7 @@ Music_Cities1_branch_ab8a:: endchannel -Music_Cities1_Ch2:: ; ab92 (2:6b92) +Music_Cities1_Ch2:: vibrato 5, 1, 5 callchannel Music_Cities1_branch_ac00 octave 4 @@ -401,7 +401,7 @@ Music_Cities1_branch_ac00:: endchannel -Music_Cities1_Ch3:: ; ac32 (2:6c32) +Music_Cities1_Ch3:: notetype 12, 1, 1 toggleperfectpitch @@ -579,7 +579,7 @@ Music_Cities1_branch_acce:: endchannel -Music_Cities1_Ch4:: ; acef (2:6cef) +Music_Cities1_Ch4:: dspeed 12 callchannel Music_Cities1_branch_ad36 diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index e0e4ab5e..897fb8c9 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,4 +1,4 @@ -Music_Cities2_Ch1:: ; b504 (2:7504) +Music_Cities2_Ch1:: tempo 148 volume 7, 7 duty 3 @@ -94,7 +94,7 @@ Music_Cities2_branch_b51a:: loopchannel 0, Music_Cities2_branch_b51a -Music_Cities2_Ch2:: ; b569 (2:7569) +Music_Cities2_Ch2:: duty 3 vibrato 8, 2, 3 notetype 12, 12, 2 @@ -280,7 +280,7 @@ Music_Cities2_branch_b58b:: loopchannel 0, Music_Cities2_branch_b58b -Music_Cities2_Ch3:: ; b640 (2:7640) +Music_Cities2_Ch3:: notetype 12, 1, 1 rest 16 octave 4 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index 803e3d02..d9a5ec35 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,4 +1,4 @@ -Music_Credits_Ch1:: ; 7fc1f (1f:7c1f) +Music_Credits_Ch1:: tempo 140 volume 7, 7 duty 3 @@ -284,7 +284,7 @@ Music_Credits_Ch1:: ; 7fc1f (1f:7c1f) endchannel -Music_Credits_Ch2:: ; 7fd5f (1f:7d5f) +Music_Credits_Ch2:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 5 @@ -574,7 +574,7 @@ Music_Credits_Ch2:: ; 7fd5f (1f:7d5f) endchannel -Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) +Music_Credits_Ch3:: notetype 12, 1, 0 octave 5 C# 6 diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index e3e6a3de..7f0d046d 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,4 +1,4 @@ -Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad) +Music_DefeatedGymLeader_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -162,7 +162,7 @@ Music_DefeatedGymLeader_branch_23ccc:: loopchannel 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch2:: ; 23d6d (8:7d6d) +Music_DefeatedGymLeader_Ch2:: duty 2 vibrato 24, 2, 4 notetype 12, 12, 4 @@ -352,7 +352,7 @@ Music_DefeatedGymLeader_branch_23d84:: loopchannel 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch3:: ; 23e52 (8:7e52) +Music_DefeatedGymLeader_Ch3:: notetype 12, 1, 0 vibrato 16, 1, 2 octave 4 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 015aaaf5..8ad51afa 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,4 +1,4 @@ -Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53) +Music_DefeatedTrainer_Ch1:: tempo 224 volume 7, 7 duty 2 @@ -95,7 +95,7 @@ Music_DefeatedTrainer_branch_23a76:: loopchannel 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1) +Music_DefeatedTrainer_Ch2:: duty 2 notetype 4, 12, 3 octave 4 @@ -172,7 +172,7 @@ Music_DefeatedTrainer_branch_23ad2:: loopchannel 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15) +Music_DefeatedTrainer_Ch3:: notetype 4, 1, 0 octave 5 D_ 2 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index 6b378400..92326a84 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,4 +1,4 @@ -Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74) +Music_DefeatedWildMon_Ch1:: tempo 112 volume 7, 7 executemusic @@ -67,7 +67,7 @@ Music_DefeatedWildMon_branch_23b8b:: loopchannel 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1) +Music_DefeatedWildMon_Ch2:: executemusic duty 2 notetype 12, 12, 3 @@ -142,7 +142,7 @@ Music_DefeatedWildMon_branch_23bce:: loopchannel 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e) +Music_DefeatedWildMon_Ch3:: executemusic notetype 12, 2, 0 octave 5 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index ac6b3e07..c84fc694 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,4 +1,4 @@ -Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1) +Music_Dungeon1_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -226,7 +226,7 @@ Music_Dungeon1_branch_7dfd5:: endchannel -Music_Dungeon1_Ch2:: ; 7dfde (1f:5fde) +Music_Dungeon1_Ch2:: vibrato 11, 1, 5 duty 3 notetype 12, 0, 15 @@ -441,7 +441,7 @@ Music_Dungeon1_branch_7e0cd:: endchannel -Music_Dungeon1_Ch3:: ; 7e0dc (1f:60dc) +Music_Dungeon1_Ch3:: notetype 12, 1, 1 vibrato 8, 2, 6 rest 14 @@ -596,7 +596,7 @@ Music_Dungeon1_branch_7e177:: endchannel -Music_Dungeon1_Ch4:: ; 7e18a (1f:618a) +Music_Dungeon1_Ch4:: dspeed 12 rest 14 cymbal1 1 diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 57e1805c..44e9d5bf 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,4 +1,4 @@ -Music_Dungeon2_Ch1:: ; 7e887 (1f:6887) +Music_Dungeon2_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -70,7 +70,7 @@ Music_Dungeon2_branch_7e892:: loopchannel 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch2:: ; 7e8d8 (1f:68d8) +Music_Dungeon2_Ch2:: vibrato 11, 1, 5 Music_Dungeon2_branch_7e8db:: @@ -162,7 +162,7 @@ Music_Dungeon2_branch_7e8db:: loopchannel 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch3:: ; 7e93b (1f:693b) +Music_Dungeon2_Ch3:: notetype 12, 1, 3 vibrato 8, 2, 6 @@ -302,7 +302,7 @@ Music_Dungeon2_branch_7e9d1:: endchannel -Music_Dungeon2_Ch4:: ; 7e9dc (1f:69dc) +Music_Dungeon2_Ch4:: dspeed 12 Music_Dungeon2_branch_7e9dd:: diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index 796d1e78..767ca626 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,4 +1,4 @@ -Music_Dungeon3_Ch1:: ; 7e9f1 (1f:69f1) +Music_Dungeon3_Ch1:: tempo 160 volume 7, 7 duty 3 @@ -335,7 +335,7 @@ Music_Dungeon3_branch_7eafc:: endchannel -Music_Dungeon3_Ch2:: ; 7eb68 (1f:6b68) +Music_Dungeon3_Ch2:: vibrato 11, 1, 5 duty 3 @@ -607,7 +607,7 @@ Music_Dungeon3_branch_7eb6d:: loopchannel 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a) +Music_Dungeon3_Ch3:: notetype 12, 1, 2 rest 16 rest 16 @@ -710,7 +710,7 @@ Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a) loopchannel 0, Music_Dungeon3_Ch3 -Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4) +Music_Dungeon3_Ch4:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index 7e4eb43b..9a13f00f 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,4 +1,4 @@ -Music_FinalBattle_Ch1:: ; 233a6 (8:73a6) +Music_FinalBattle_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -381,7 +381,7 @@ Music_FinalBattle_branch_23429:: loopchannel 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch2:: ; 2356a (8:756a) +Music_FinalBattle_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -738,7 +738,7 @@ Music_FinalBattle_branch_23710:: endchannel -Music_FinalBattle_Ch3:: ; 2371c (8:771c) +Music_FinalBattle_Ch3:: notetype 12, 1, 1 octave 4 E_ 4 diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 97ed4e77..52b85e08 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,4 +1,4 @@ -Music_GameCorner_Ch1:: ; 7e20b (1f:620b) +Music_GameCorner_Ch1:: tempo 120 volume 7, 7 duty 3 @@ -183,7 +183,7 @@ Music_GameCorner_branch_7e222:: loopchannel 0, Music_GameCorner_branch_7e222 -Music_GameCorner_Ch2:: ; 7e2df (1f:62df) +Music_GameCorner_Ch2:: duty 2 vibrato 10, 2, 3 notetype 12, 12, 6 @@ -343,7 +343,7 @@ Music_GameCorner_branch_7e2fa:: loopchannel 0, Music_GameCorner_branch_7e2fa -Music_GameCorner_Ch3:: ; 7e38b (1f:638b) +Music_GameCorner_Ch3:: notetype 12, 1, 3 octave 5 C# 1 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index 3ee51100..b314336d 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,4 +1,4 @@ -Music_Gym_Ch1:: ; bcbb (2:7cbb) +Music_Gym_Ch1:: tempo 138 volume 7, 7 duty 3 @@ -165,7 +165,7 @@ Music_Gym_branch_bcd8:: loopchannel 0, Music_Gym_branch_bcd8 -Music_Gym_Ch2:: ; bd6b (2:7d6b) +Music_Gym_Ch2:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 7 @@ -288,7 +288,7 @@ Music_Gym_branch_bd82:: loopchannel 0, Music_Gym_branch_bd82 -Music_Gym_Ch3:: ; bdfa (2:7dfa) +Music_Gym_Ch3:: notetype 12, 1, 1 rest 16 rest 10 diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index c4a702e5..1eb2951d 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,4 +1,4 @@ -Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370) +Music_GymLeaderBattle_Ch1:: tempo 104 volume 7, 7 duty 3 @@ -547,7 +547,7 @@ Music_GymLeaderBattle_branch_223b0:: loopchannel 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch2:: ; 225a1 (8:65a1) +Music_GymLeaderBattle_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -848,7 +848,7 @@ Music_GymLeaderBattle_branch_225e0:: loopchannel 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch3:: ; 226ef (8:66ef) +Music_GymLeaderBattle_Ch3:: vibrato 0, 2, 0 notetype 12, 1, 3 rest 12 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 86fff1c8..69f926f6 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,4 +1,4 @@ -Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf) +Music_HallOfFame_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -31,7 +31,7 @@ Music_HallOfFame_branch_7fbc5:: loopchannel 0, Music_HallOfFame_branch_7fbc5 -Music_HallOfFame_Ch2:: ; 7fbda (1f:7bda) +Music_HallOfFame_Ch2:: vibrato 8, 2, 5 duty 3 @@ -63,7 +63,7 @@ Music_HallOfFame_branch_7fbdf:: loopchannel 0, Music_HallOfFame_branch_7fbdf -Music_HallOfFame_Ch3:: ; 7fbfc (1f:7bfc) +Music_HallOfFame_Ch3:: notetype 12, 1, 2 Music_HallOfFame_branch_7fbfe:: diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index ab4df7a7..61623e39 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,4 +1,4 @@ -Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0) +Music_IndigoPlateau_Ch1:: tempo 132 volume 7, 7 duty 3 @@ -86,7 +86,7 @@ Music_IndigoPlateau_branch_a659:: endchannel -Music_IndigoPlateau_Ch2:: ; a664 (2:6664) +Music_IndigoPlateau_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -147,7 +147,7 @@ Music_IndigoPlateau_branch_a6af:: endchannel -Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba) +Music_IndigoPlateau_Ch3:: notetype 12, 1, 0 octave 4 D_ 2 @@ -225,7 +225,7 @@ Music_IndigoPlateau_branch_a6fe:: endchannel -Music_IndigoPlateau_Ch4:: ; a70f (2:670f) +Music_IndigoPlateau_Ch4:: dspeed 6 mutedsnare2 16 mutedsnare2 16 diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index ff7d85d8..fd4a8e35 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,4 +1,4 @@ -Music_IntroBattle_Ch1:: ; 7f844 (1f:7844) +Music_IntroBattle_Ch1:: tempo 98 volume 7, 7 duty 3 @@ -90,7 +90,7 @@ Music_IntroBattle_Ch1:: ; 7f844 (1f:7844) endchannel -Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc) +Music_IntroBattle_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -165,7 +165,7 @@ Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc) endchannel -Music_IntroBattle_Ch3:: ; 7f91d (1f:791d) +Music_IntroBattle_Ch3:: notetype 12, 1, 0 rest 8 octave 4 @@ -229,7 +229,7 @@ Music_IntroBattle_Ch3:: ; 7f91d (1f:791d) endchannel -Music_IntroBattle_Ch4:: ; 7f95b (1f:795b) +Music_IntroBattle_Ch4:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index e21d331f..9a01246b 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -1,4 +1,4 @@ -Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d) +Music_JigglypuffSong_Ch1:: tempo 144 volume 7, 7 vibrato 8, 2, 4 @@ -21,7 +21,7 @@ Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d) endchannel -Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a) +Music_JigglypuffSong_Ch2:: vibrato 5, 1, 5 duty 2 dutycycle 10 diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index b655a488..7b60cc24 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,4 +1,4 @@ -Music_Lavender_Ch1:: ; bb58 (2:7b58) +Music_Lavender_Ch1:: tempo 152 volume 7, 7 duty 1 @@ -62,7 +62,7 @@ Music_Lavender_branch_bb6b:: loopchannel 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch2:: ; bb9e (2:7b9e) +Music_Lavender_Ch2:: vibrato 0, 3, 4 duty 3 notetype 12, 9, 1 @@ -76,7 +76,7 @@ Music_Lavender_branch_bba5:: loopchannel 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch3:: ; bbae (2:7bae) +Music_Lavender_Ch3:: vibrato 4, 1, 1 notetype 12, 3, 5 rest 16 @@ -186,7 +186,7 @@ Music_Lavender_branch_bbb9:: loopchannel 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch4:: ; bc21 (2:7c21) +Music_Lavender_Ch4:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 77324e5c..2378a03a 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,4 +1,4 @@ -Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d) +Music_MeetEvilTrainer_Ch1:: tempo 124 volume 7, 7 duty 2 @@ -21,7 +21,7 @@ Music_MeetEvilTrainer_branch_7f6ae:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch2:: ; 7f6ba (1f:76ba) +Music_MeetEvilTrainer_Ch2:: duty 1 notetype 12, 11, 6 octave 3 @@ -60,7 +60,7 @@ Music_MeetEvilTrainer_branch_7f6c2:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch3:: ; 7f6e6 (1f:76e6) +Music_MeetEvilTrainer_Ch3:: notetype 12, 1, 0 rest 8 octave 4 diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index b416987d..0f24f99e 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9) +Music_MeetFemaleTrainer_Ch1:: tempo 124 volume 7, 7 duty 1 @@ -26,7 +26,7 @@ Music_MeetFemaleTrainer_branch_7f70c:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch2:: ; 7f71c (1f:771c) +Music_MeetFemaleTrainer_Ch2:: duty 2 notetype 12, 12, 2 octave 3 @@ -71,7 +71,7 @@ Music_MeetFemaleTrainer_branch_7f726:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch3:: ; 7f74b (1f:774b) +Music_MeetFemaleTrainer_Ch3:: notetype 12, 1, 0 rest 8 octave 5 diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index 0a2e8396..92047849 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b) +Music_MeetMaleTrainer_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -32,7 +32,7 @@ Music_MeetMaleTrainer_branch_7f78f:: loopchannel 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch2:: ; 7f7a2 (1f:77a2) +Music_MeetMaleTrainer_Ch2:: duty 3 vibrato 24, 2, 2 notetype 12, 12, 4 @@ -75,7 +75,7 @@ Music_MeetMaleTrainer_branch_7f7b5:: loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch3:: ; 7f7d2 (1f:77d2) +Music_MeetMaleTrainer_Ch3:: notetype 12, 1, 0 rest 6 octave 4 diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index a2f0abca..6532a187 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,4 +1,4 @@ -Music_MeetProfOak_Ch1:: ; af59 (2:6f59) +Music_MeetProfOak_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -74,7 +74,7 @@ Music_MeetProfOak_branch_af85:: loopchannel 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch2:: ; afa9 (2:6fa9) +Music_MeetProfOak_Ch2:: vibrato 8, 1, 1 duty 2 notetype 12, 12, 4 @@ -208,7 +208,7 @@ Music_MeetProfOak_branch_b005:: loopchannel 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch3:: ; b03d (2:703d) +Music_MeetProfOak_Ch3:: notetype 12, 1, 2 rest 10 octave 4 diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index 1588e1c7..153523af 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -2,7 +2,7 @@ Music_MeetRival_branch_b119:: tempo 100 loopchannel 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch1:: ; b120 (2:7120) +Music_MeetRival_Ch1:: tempo 112 Music_MeetRival_branch_b123:: @@ -143,7 +143,7 @@ Music_MeetRival_branch_b1a5:: loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch2:: ; b1bb (2:71bb) +Music_MeetRival_Ch2:: duty 3 vibrato 10, 2, 6 notetype 12, 12, 7 @@ -248,7 +248,7 @@ Music_MeetRival_branch_b21d:: loopchannel 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch3:: ; b233 (2:7233) +Music_MeetRival_Ch3:: notetype 12, 1, 4 octave 5 D_ 2 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index 2e2b79bf..cb08fcf4 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,4 +1,4 @@ -Music_MuseumGuy_Ch1:: ; adae (2:6dae) +Music_MuseumGuy_Ch1:: tempo 128 volume 7, 7 duty 2 @@ -54,7 +54,7 @@ Music_MuseumGuy_branch_adec:: endchannel -Music_MuseumGuy_Ch2:: ; adf1 (2:6df1) +Music_MuseumGuy_Ch2:: duty 2 notetype 12, 12, 1 octave 4 @@ -165,7 +165,7 @@ Music_MuseumGuy_branch_ae26:: loopchannel 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch3:: ; ae6e (2:6e6e) +Music_MuseumGuy_Ch3:: notetype 12, 1, 0 rest 16 octave 4 @@ -261,7 +261,7 @@ Music_MuseumGuy_branch_aec1:: endchannel -Music_MuseumGuy_Ch4:: ; aed1 (2:6ed1) +Music_MuseumGuy_Ch4:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 018a3e92..7214264c 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,4 +1,4 @@ -Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9) +Music_OaksLab_Ch1:: tempo 140 volume 7, 7 duty 3 @@ -69,7 +69,7 @@ Music_OaksLab_branch_7eed0:: loopchannel 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch2:: ; 7ef05 (1f:6f05) +Music_OaksLab_Ch2:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 4 @@ -144,7 +144,7 @@ Music_OaksLab_branch_7ef16:: loopchannel 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch3:: ; 7ef52 (1f:6f52) +Music_OaksLab_Ch3:: notetype 12, 1, 1 rest 2 octave 4 diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 9d64b331..0c8b7dbc 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,4 +1,4 @@ -Music_PalletTown_Ch1:: ; a7c5 (2:67c5) +Music_PalletTown_Ch1:: tempo 160 volume 7, 7 duty 2 @@ -148,7 +148,7 @@ Music_PalletTown_branch_a7ce:: endchannel -Music_PalletTown_Ch2:: ; a85f (2:685f) +Music_PalletTown_Ch2:: duty 2 Music_PalletTown_branch_a861:: @@ -262,7 +262,7 @@ Music_PalletTown_branch_a861:: endchannel -Music_PalletTown_Ch3:: ; a8de (2:68de) +Music_PalletTown_Ch3:: vibrato 24, 2, 8 notetype 12, 1, 2 diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index c802f217..2b7b545b 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,4 +1,4 @@ -Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3) +Music_PkmnHealed_Ch1:: tempo 144 volume 7, 7 duty 2 @@ -19,7 +19,7 @@ Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3) endchannel -Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4) +Music_PkmnHealed_Ch2:: duty 2 notetype 12, 12, 3 octave 4 @@ -33,7 +33,7 @@ Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4) endchannel -Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2) +Music_PkmnHealed_Ch3:: notetype 12, 1, 0 octave 4 E_ 2 diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index d0c9ef2c..5de546ad 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,4 +1,4 @@ -Music_Pokecenter_Ch1:: ; be56 (2:7e56) +Music_Pokecenter_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -149,7 +149,7 @@ Music_Pokecenter_branch_be61:: loopchannel 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch2:: ; bef9 (2:7ef9) +Music_Pokecenter_Ch2:: vibrato 8, 2, 5 Music_Pokecenter_branch_befc:: @@ -248,7 +248,7 @@ Music_Pokecenter_branch_bf60:: endchannel -Music_Pokecenter_Ch3:: ; bf70 (2:7f70) +Music_Pokecenter_Ch3:: notetype 12, 1, 0 Music_Pokecenter_branch_bf72:: diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index 9bb7826e..afae9a75 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,4 +1,4 @@ -Music_PokemonTower_Ch1:: ; 7f04a (1f:704a) +Music_PokemonTower_Ch1:: tempo 152 volume 7, 7 duty 3 @@ -140,7 +140,7 @@ Music_PokemonTower_branch_7f05a:: loopchannel 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch2:: ; 7f0e3 (1f:70e3) +Music_PokemonTower_Ch2:: vibrato 20, 3, 4 duty 3 notetype 12, 10, 0 @@ -292,7 +292,7 @@ Music_PokemonTower_branch_7f0ee:: loopchannel 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch3:: ; 7f19a (1f:719a) +Music_PokemonTower_Ch3:: vibrato 4, 1, 1 notetype 12, 1, 3 rest 8 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index 81f138eb..bab18261 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -1,4 +1,4 @@ -Music_Routes1_Ch1:: ; 9bde (2:5bde) +Music_Routes1_Ch1:: tempo 152 volume 7, 7 vibrato 4, 2, 3 @@ -106,7 +106,7 @@ Music_Routes1_branch_9be9:: endchannel -Music_Routes1_Ch2:: ; 9c51 (2:5c51) +Music_Routes1_Ch2:: duty 2 Music_Routes1_branch_9c53:: @@ -234,7 +234,7 @@ Music_Routes1_branch_9c8d:: endchannel -Music_Routes1_Ch3:: ; 9cd8 (2:5cd8) +Music_Routes1_Ch3:: vibrato 8, 2, 5 notetype 12, 1, 3 @@ -309,7 +309,7 @@ Music_Routes1_branch_9cdd:: endchannel -Music_Routes1_Ch4:: ; 9d24 (2:5d24) +Music_Routes1_Ch4:: dspeed 12 rest 4 mutedsnare1 2 diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 3926c8de..42b4deda 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -1,4 +1,4 @@ -Music_Routes2_Ch1:: ; 9db9 (2:5db9) +Music_Routes2_Ch1:: tempo 152 volume 7, 7 vibrato 9, 2, 5 @@ -142,7 +142,7 @@ Music_Routes2_branch_9dc3:: endchannel -Music_Routes2_Ch2:: ; 9e4f (2:5e4f) +Music_Routes2_Ch2:: vibrato 8, 2, 6 duty 3 @@ -216,7 +216,7 @@ Music_Routes2_branch_9e54:: endchannel -Music_Routes2_Ch3:: ; 9e9b (2:5e9b) +Music_Routes2_Ch3:: vibrato 9, 2, 8 Music_Routes2_branch_9e9e:: @@ -324,7 +324,7 @@ Music_Routes2_branch_9e9e:: endchannel -Music_Routes2_Ch4:: ; 9f08 (2:5f08) +Music_Routes2_Ch4:: dspeed 12 snare3 2 rest 2 diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index 09a0516f..d0d1672e 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,4 +1,4 @@ -Music_Routes3_Ch1:: ; 9fad (2:5fad) +Music_Routes3_Ch1:: tempo 148 volume 7, 7 duty 3 @@ -77,7 +77,7 @@ Music_Routes3_branch_9fc3:: loopchannel 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch2:: ; a009 (2:6009) +Music_Routes3_Ch2:: vibrato 8, 2, 3 duty 2 notetype 12, 12, 7 @@ -178,7 +178,7 @@ Music_Routes3_branch_a01a:: loopchannel 0, Music_Routes3_branch_a01a -Music_Routes3_Ch3:: ; a07f (2:607f) +Music_Routes3_Ch3:: vibrato 4, 1, 0 notetype 6, 1, 2 octave 4 @@ -354,7 +354,7 @@ Music_Routes3_branch_a0a3:: loopchannel 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch4:: ; a131 (2:6131) +Music_Routes3_Ch4:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index d67411f7..9bbf44ea 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,4 +1,4 @@ -Music_Routes4_Ch1:: ; a26a (2:626a) +Music_Routes4_Ch1:: tempo 148 volume 7, 7 duty 3 @@ -138,7 +138,7 @@ Music_Routes4_branch_a28a:: loopchannel 0, Music_Routes4_branch_a28a -Music_Routes4_Ch2:: ; a304 (2:6304) +Music_Routes4_Ch2:: vibrato 12, 2, 4 duty 1 notetype 12, 9, 2 @@ -288,7 +288,7 @@ Music_Routes4_branch_a325:: loopchannel 0, Music_Routes4_branch_a325 -Music_Routes4_Ch3:: ; a3c4 (2:63c4) +Music_Routes4_Ch3:: notetype 12, 1, 0 octave 4 E_ 1 @@ -506,7 +506,7 @@ Music_Routes4_branch_a3d7:: loopchannel 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch4:: ; a49d (2:649d) +Music_Routes4_Ch4:: dspeed 12 rest 16 rest 12 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index afa81f17..45d84fd0 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -1,4 +1,4 @@ -Music_SafariZone_Ch1:: ; bc2e (2:7c2e) +Music_SafariZone_Ch1:: tempo 132 volume 7, 7 vibrato 6, 3, 4 @@ -39,7 +39,7 @@ Music_SafariZone_branch_bc5f:: endchannel -Music_SafariZone_Ch2:: ; bc6a (2:7c6a) +Music_SafariZone_Ch2:: duty 2 vibrato 8, 2, 5 notetype 12, 10, 2 @@ -73,7 +73,7 @@ Music_SafariZone_branch_bc89:: endchannel -Music_SafariZone_Ch3:: ; bc94 (2:7c94) +Music_SafariZone_Ch3:: notetype 12, 1, 0 rest 8 diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 853d248d..2b6d8134 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,4 +1,4 @@ -Music_SilphCo_Ch1:: ; 7f243 (1f:7243) +Music_SilphCo_Ch1:: tempo 160 volume 7, 7 duty 3 @@ -395,7 +395,7 @@ Music_SilphCo_branch_7f3f0:: endchannel -Music_SilphCo_Ch2:: ; 7f409 (1f:7409) +Music_SilphCo_Ch2:: vibrato 10, 3, 2 duty 3 notetype 6, 12, 3 @@ -780,7 +780,7 @@ Music_SilphCo_branch_7f42e:: loopchannel 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch3:: ; 7f5be (1f:75be) +Music_SilphCo_Ch3:: vibrato 8, 1, 1 notetype 12, 1, 1 rest 12 diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index 62fd1a02..ea6b1a0f 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,4 +1,4 @@ -Music_SSAnne_Ch1:: ; b3a7 (2:73a7) +Music_SSAnne_Ch1:: tempo 128 volume 7, 7 duty 1 @@ -107,7 +107,7 @@ Music_SSAnne_branch_b3b2:: loopchannel 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch2:: ; b419 (2:7419) +Music_SSAnne_Ch2:: duty 0 vibrato 12, 2, 4 @@ -282,7 +282,7 @@ Music_SSAnne_branch_b41e:: loopchannel 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch3:: ; b4cb (2:74cb) +Music_SSAnne_Ch3:: notetype 12, 1, 3 rest 16 rest 12 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index 4ee84233..03ebfed0 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,4 +1,4 @@ -Music_Surfing_Ch1:: ; 7fa19 (1f:7a19) +Music_Surfing_Ch1:: tempo 160 volume 7, 7 duty 3 @@ -116,7 +116,7 @@ Music_Surfing_branch_7fa30:: loopchannel 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch2:: ; 7fa9c (1f:7a9c) +Music_Surfing_Ch2:: duty 3 vibrato 16, 2, 5 notetype 12, 12, 6 @@ -203,7 +203,7 @@ Music_Surfing_branch_7faae:: loopchannel 0, Music_Surfing_branch_7faae -Music_Surfing_Ch3:: ; 7fafa (1f:7afa) +Music_Surfing_Ch3:: notetype 12, 1, 0 rest 12 octave 5 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index edd3352f..b28474eb 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,4 +1,4 @@ -Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0) +Music_TitleScreen_Ch1:: tempo 144 volume 7, 7 vibrato 9, 3, 4 @@ -154,7 +154,7 @@ Music_TitleScreen_branch_7e55c:: endchannel -Music_TitleScreen_Ch2:: ; 7e578 (1f:6578) +Music_TitleScreen_Ch2:: vibrato 16, 4, 6 duty 1 notetype 12, 14, 1 @@ -321,7 +321,7 @@ Music_TitleScreen_branch_7e636:: endchannel -Music_TitleScreen_Ch3:: ; 7e643 (1f:6643) +Music_TitleScreen_Ch3:: notetype 12, 1, 0 octave 3 G_ 1 @@ -459,7 +459,7 @@ Music_TitleScreen_branch_7e6e5:: endchannel -Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb) +Music_TitleScreen_Ch4:: dspeed 6 rest 4 snare3 1 diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index ffc17e20..395f05de 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,4 +1,4 @@ -Music_TrainerBattle_Ch1:: ; 22919 (8:6919) +Music_TrainerBattle_Ch1:: tempo 112 volume 7, 7 duty 3 @@ -649,7 +649,7 @@ Music_TrainerBattle_branch_22962:: loopchannel 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch2:: ; 22bae (8:6bae) +Music_TrainerBattle_Ch2:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 2 @@ -953,7 +953,7 @@ Music_TrainerBattle_branch_22bfc:: loopchannel 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch3:: ; 22d10 (8:6d10) +Music_TrainerBattle_Ch3:: vibrato 0, 2, 0 notetype 12, 1, 4 octave 3 diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index c2c87891..10ca4beb 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -1,4 +1,4 @@ -Music_UnusedSong_Ch1:: ; a913 (2:6913) +Music_UnusedSong_Ch1:: tempo 144 volume 7, 7 vibrato 5, 1, 6 @@ -182,7 +182,7 @@ Music_UnusedSong_branch_a91b:: endchannel -Music_UnusedSong_Ch2:: ; a9cf (2:69cf) +Music_UnusedSong_Ch2:: tempo 144 volume 7, 7 toggleperfectpitch diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index 59ea3e08..94f87b25 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,4 +1,4 @@ -Music_Vermilion_Ch1:: ; b9eb (2:79eb) +Music_Vermilion_Ch1:: tempo 156 volume 7, 7 duty 3 @@ -111,7 +111,7 @@ Music_Vermilion_branch_b9f6:: loopchannel 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch2:: ; ba61 (2:7a61) +Music_Vermilion_Ch2:: duty 3 vibrato 10, 2, 3 @@ -178,7 +178,7 @@ Music_Vermilion_branch_ba66:: loopchannel 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch3:: ; baa6 (2:7aa6) +Music_Vermilion_Ch3:: notetype 12, 1, 0 Music_Vermilion_branch_baa8:: @@ -282,7 +282,7 @@ Music_Vermilion_branch_baa8:: loopchannel 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch4:: ; bb0d (2:7b0d) +Music_Vermilion_Ch4:: dspeed 12 Music_Vermilion_branch_bb0e:: diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index e37e4b06..3a88678f 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,4 +1,4 @@ -Music_WildBattle_Ch1:: ; 23099 (8:7099) +Music_WildBattle_Ch1:: tempo 104 volume 7, 7 duty 3 @@ -300,7 +300,7 @@ Music_WildBattle_branch_230e0:: loopchannel 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch2:: ; 231d8 (8:71d8) +Music_WildBattle_Ch2:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -462,7 +462,7 @@ Music_WildBattle_branch_23225:: loopchannel 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch3:: ; 23290 (8:7290) +Music_WildBattle_Ch3:: vibrato 0, 2, 0 notetype 12, 1, 1 octave 4 diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm index 168b1bdc..086fef53 100644 --- a/audio/music/yellow/meetjessiejames.asm +++ b/audio/music/yellow/meetjessiejames.asm @@ -1,4 +1,4 @@ -Music_MeetJessieJames_Ch1:: ; 8316d (20:716d) +Music_MeetJessieJames_Ch1:: tempo 144 volume 7, 7 duty 3 @@ -77,7 +77,7 @@ Music_MeetJessieJames_branch_83187:: loopchannel 0, Music_MeetJessieJames_branch_83187 -Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8) +Music_MeetJessieJames_Ch2:: duty 3 vibrato 6, 1, 5 notetype 12, 12, 2 @@ -164,7 +164,7 @@ Music_MeetJessieJames_branch_831df:: loopchannel 0, Music_MeetJessieJames_branch_831df -Music_MeetJessieJames_Ch3:: ; 8322a (20:722a) +Music_MeetJessieJames_Ch3:: notetype 12, 1, 0 rest 16 rest 8 diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm index 466a2c53..1ee3f760 100644 --- a/audio/music/yellow/surfingpikachu.asm +++ b/audio/music/yellow/surfingpikachu.asm @@ -1,4 +1,4 @@ -Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8) +Music_SurfingPikachu_Ch1:: tempo 117 volume 7, 7 duty 3 @@ -162,7 +162,7 @@ Music_SurfingPikachu_branch_82d1a:: loopchannel 0, Music_SurfingPikachu_branch_82d1a -Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d) +Music_SurfingPikachu_Ch2:: duty 3 vibrato 6, 1, 5 notetype 12, 12, 4 @@ -312,7 +312,7 @@ Music_SurfingPikachu_branch_82de0:: loopchannel 0, Music_SurfingPikachu_branch_82de0 -Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45) +Music_SurfingPikachu_Ch3:: notetype 12, 1, 0 octave 4 B_ 6 diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm index 9b0b52ab..c809d10f 100644 --- a/audio/music/yellow/yellowintro.asm +++ b/audio/music/yellow/yellowintro.asm @@ -1,4 +1,4 @@ -Music_YellowIntro_Ch1:: ; 7f65c (1f:765c) +Music_YellowIntro_Ch1:: tempo 116 volume 7, 7 duty 3 @@ -100,7 +100,7 @@ Music_YellowIntro_Ch1:: ; 7f65c (1f:765c) endchannel -Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3) +Music_YellowIntro_Ch2:: duty 2 vibrato 6, 1, 5 notetype 12, 12, 2 @@ -203,7 +203,7 @@ Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3) endchannel -Music_YellowIntro_Ch3:: ; 7f749 (1f:7749) +Music_YellowIntro_Ch3:: notetype 12, 1, 0 octave 4 E_ 1 diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm index 86e55ee8..f65ca164 100644 --- a/audio/music/yellow/yellowunusedsong.asm +++ b/audio/music/yellow/yellowunusedsong.asm @@ -1,4 +1,4 @@ -Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe) +Music_YellowUnusedSong_Ch1:: tempo 140 volume 7, 7 duty 3 @@ -75,7 +75,7 @@ Music_YellowUnusedSong_branch_82fde:: loopchannel 0, Music_YellowUnusedSong_branch_82fde -Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010) +Music_YellowUnusedSong_Ch2:: duty 2 notetype 8, 12, 2 octave 4 @@ -161,7 +161,7 @@ Music_YellowUnusedSong_branch_8302a:: loopchannel 0, Music_YellowUnusedSong_branch_8302a -Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068) +Music_YellowUnusedSong_Ch3:: notetype 12, 1, 0 vibrato 2, 1, 5 rest 16 @@ -202,7 +202,7 @@ Music_YellowUnusedSong_branch_83075:: loopchannel 0, Music_YellowUnusedSong_branch_83075 -Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092) +Music_YellowUnusedSong_Ch4:: dspeed 12 snare3 4 dspeed 8 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index 6cbfdb16..c14be83e 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,10 +1,10 @@ -SFX_59_1_Ch1: ; 841b (2:441b) +SFX_59_1_Ch1: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_1_Ch2: ; 8422 (2:4422) +SFX_59_1_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 9c808359..3b817f2f 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,10 +1,10 @@ -SFX_59_3_Ch1: ; 7c404 (1f:4404) +SFX_59_3_Ch1: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_3_Ch2: ; 7c40b (1f:440b) +SFX_59_3_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 172907a8..6c3959c9 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649) +SFX_Arrow_Tiles_1_Ch1: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index fd225a5f..8ff79858 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626) +SFX_Arrow_Tiles_3_Ch1: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 46fb2a07..6cd9701b 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,4 +1,4 @@ -SFX_Ball_Poof_Ch1: ; 2043d (8:443d) +SFX_Ball_Poof_Ch1: duty 2 unknownsfx0x10 22 unknownsfx0x20 15, 242, 0, 4 @@ -6,6 +6,6 @@ SFX_Ball_Poof_Ch1: ; 2043d (8:443d) endchannel -SFX_Ball_Poof_Ch2: ; 20448 (8:4448) +SFX_Ball_Poof_Ch2: unknownnoise0x20 15, 162, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index fc9f81cc..49176db3 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch1: ; 2042d (8:442d) +SFX_Ball_Toss_Ch1: duty 2 unknownsfx0x10 47 unknownsfx0x20 15, 242, 128, 7 endchannel -SFX_Ball_Toss_Ch2: ; 20436 (8:4436) +SFX_Ball_Toss_Ch2: duty 2 unknownsfx0x20 15, 194, 130, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 19e9b9e7..8b92fc50 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,4 +1,4 @@ -SFX_Battle_09_Ch1: ; 204b9 (8:44b9) +SFX_Battle_09_Ch1: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 5 diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 1a7e17ec..27909666 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch1: ; 204c8 (8:44c8) +SFX_Battle_0B_Ch1: unknownnoise0x20 8, 241, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index b2fdf455..7aa009ba 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,4 +1,4 @@ -SFX_Battle_0C_Ch1: ; 204cc (8:44cc) +SFX_Battle_0C_Ch1: unknownnoise0x20 15, 143, 17 unknownnoise0x20 4, 255, 18 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index c70b281d..1b69e13f 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,4 +1,4 @@ -SFX_Battle_0D_Ch1: ; 204d6 (8:44d6) +SFX_Battle_0D_Ch1: unknownnoise0x20 15, 143, 52 unknownnoise0x20 8, 242, 53 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index 20c20628..ff60cb9e 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch1: ; 204e0 (8:44e0) +SFX_Battle_0E_Ch1: unknownnoise0x20 15, 159, 35 unknownnoise0x20 8, 241, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index d84aed37..3827a5a6 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,4 +1,4 @@ -SFX_Battle_0F_Ch1: ; 204e7 (8:44e7) +SFX_Battle_0F_Ch1: unknownnoise0x20 2, 225, 75 unknownnoise0x20 10, 241, 68 unknownnoise0x20 2, 225, 58 diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 324ce9b9..7d301053 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,4 +1,4 @@ -SFX_Battle_12_Ch1: ; 2050b (8:450b) +SFX_Battle_12_Ch1: unknownnoise0x20 8, 79, 35 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 74349bb5..89b8c555 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,4 +1,4 @@ -SFX_Battle_13_Ch1: ; 20519 (8:4519) +SFX_Battle_13_Ch1: unknownnoise0x20 8, 79, 51 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 82234904..acc064f7 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,4 +1,4 @@ -SFX_Battle_14_Ch1: ; 20526 (8:4526) +SFX_Battle_14_Ch1: unknownnoise0x20 8, 255, 50 unknownnoise0x20 8, 244, 67 unknownnoise0x20 8, 242, 84 diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index a2b5031e..3aa31247 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,4 +1,4 @@ -SFX_Battle_16_Ch1: ; 2054c (8:454c) +SFX_Battle_16_Ch1: unknownnoise0x20 1, 148, 35 unknownnoise0x20 1, 180, 34 unknownnoise0x20 8, 241, 68 diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 4be1d96b..2ff4bd6d 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,4 +1,4 @@ -SFX_Battle_17_Ch1: ; 20556 (8:4556) +SFX_Battle_17_Ch1: unknownnoise0x20 2, 148, 51 unknownnoise0x20 4, 180, 34 unknownnoise0x20 4, 241, 68 diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index 6c201d38..81fa2178 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch1: ; 20563 (8:4563) +SFX_Battle_18_Ch1: unknownnoise0x20 4, 255, 85 unknownnoise0x20 8, 241, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 6b54f8cd..9981f5e4 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,4 +1,4 @@ -SFX_Battle_19_Ch1: ; 2056a (8:456a) +SFX_Battle_19_Ch1: unknownnoise0x20 2, 132, 67 unknownnoise0x20 2, 196, 34 unknownnoise0x20 8, 242, 52 diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 3bb451d5..9f89e449 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch1: ; 2057b (8:457b) +SFX_Battle_1B_Ch1: unknownnoise0x20 2, 241, 34 unknownnoise0x20 15, 242, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 579e36cc..3827b34c 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,4 +1,4 @@ -SFX_Battle_1C_Ch1: ; 20582 (8:4582) +SFX_Battle_1C_Ch1: unknownnoise0x20 2, 194, 1 unknownnoise0x20 15, 244, 1 unknownnoise0x20 15, 242, 1 diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index df556540..f4e9bdc8 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,4 +1,4 @@ -SFX_Battle_1E_Ch1: ; 20593 (8:4593) +SFX_Battle_1E_Ch1: duty 0 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -8,7 +8,7 @@ SFX_Battle_1E_Ch1: ; 20593 (8:4593) endchannel -SFX_Battle_1E_Ch2: ; 205a4 (8:45a4) +SFX_Battle_1E_Ch2: unknownnoise0x20 0, 209, 66 unknownnoise0x20 4, 161, 50 unknownnoise0x20 0, 209, 34 diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index 142030ee..e8a4d9f3 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch1: ; 205be (8:45be) +SFX_Battle_20_Ch1: unknownnoise0x20 12, 241, 84 unknownnoise0x20 8, 241, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index 10ad350e..b59f5833 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,4 +1,4 @@ -SFX_Battle_21_Ch1: ; 205c5 (8:45c5) +SFX_Battle_21_Ch1: unknownnoise0x20 2, 241, 51 unknownnoise0x20 2, 193, 50 unknownnoise0x20 2, 161, 49 diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index c6b0d972..66cd218d 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch1: ; 205d5 (8:45d5) +SFX_Battle_22_Ch1: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index 474e43b6..7203dcf2 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,4 +1,4 @@ -SFX_Battle_23_Ch1: ; 205dc (8:45dc) +SFX_Battle_23_Ch1: unknownnoise0x20 2, 242, 67 unknownnoise0x20 4, 181, 50 unknownnoise0x20 9, 134, 49 diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 4fea9cf9..7c81b40b 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,4 +1,4 @@ -SFX_Battle_24_Ch1: ; 205ec (8:45ec) +SFX_Battle_24_Ch1: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_24_Ch1: ; 205ec (8:45ec) endchannel -SFX_Battle_24_Ch2: ; 205f7 (8:45f7) +SFX_Battle_24_Ch2: unknownnoise0x20 15, 63, 34 unknownnoise0x20 15, 242, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 18a70f45..b1f4fc54 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,4 +1,4 @@ -SFX_Battle_25_Ch1: ; 205fe (8:45fe) +SFX_Battle_25_Ch1: unknownnoise0x20 15, 79, 65 unknownnoise0x20 8, 143, 65 unknownnoise0x20 8, 207, 65 diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index 943078e1..c656264b 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,4 +1,4 @@ -SFX_Battle_26_Ch1: ; 2060e (8:460e) +SFX_Battle_26_Ch1: unknownnoise0x20 10, 255, 80 unknownnoise0x20 15, 255, 81 unknownnoise0x20 8, 242, 81 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index ddd4e452..af86c33f 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,4 +1,4 @@ -SFX_Battle_27_Ch1: ; 20624 (8:4624) +SFX_Battle_27_Ch1: duty 2 unknownsfx0x20 15, 63, 192, 7 @@ -9,7 +9,7 @@ SFX_Battle_27_branch_2062a: endchannel -SFX_Battle_27_Ch2: ; 20637 (8:4637) +SFX_Battle_27_Ch2: dutycycle 179 unknownsfx0x20 15, 47, 200, 7 @@ -20,7 +20,7 @@ SFX_Battle_27_branch_2063d: endchannel -SFX_Battle_27_Ch3: ; 2064a (8:464a) +SFX_Battle_27_Ch3: unknownnoise0x20 3, 151, 18 unknownnoise0x20 3, 161, 17 loopchannel 10, SFX_Battle_27_Ch3 diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 73855179..1c974e85 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,4 +1,4 @@ -SFX_Battle_28_Ch1: ; 20655 (8:4655) +SFX_Battle_28_Ch1: duty 0 unknownsfx0x20 0, 241, 192, 7 unknownsfx0x20 0, 241, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_28_Ch1: ; 20655 (8:4655) endchannel -SFX_Battle_28_Ch2: ; 20664 (8:4664) +SFX_Battle_28_Ch2: dutycycle 179 unknownsfx0x20 0, 225, 193, 7 unknownsfx0x20 0, 225, 1, 7 @@ -14,7 +14,7 @@ SFX_Battle_28_Ch2: ; 20664 (8:4664) endchannel -SFX_Battle_28_Ch3: ; 20673 (8:4673) +SFX_Battle_28_Ch3: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 loopchannel 6, SFX_Battle_28_Ch3 diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index e766a453..d0abb3cb 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,4 +1,4 @@ -SFX_Battle_29_Ch1: ; 2067e (8:467e) +SFX_Battle_29_Ch1: dutycycle 201 unknownsfx0x20 11, 243, 32, 1 unknownsfx0x20 9, 211, 80, 1 @@ -8,7 +8,7 @@ SFX_Battle_29_Ch1: ; 2067e (8:467e) endchannel -SFX_Battle_29_Ch2: ; 20695 (8:4695) +SFX_Battle_29_Ch2: unknownnoise0x20 10, 243, 53 unknownnoise0x20 14, 246, 69 loopchannel 4, SFX_Battle_29_Ch2 diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index d7334aae..ab01bf85 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,4 +1,4 @@ -SFX_Battle_2A_Ch1: ; 206a9 (8:46a9) +SFX_Battle_2A_Ch1: dutycycle 57 unknownsfx0x20 4, 244, 0, 6 unknownsfx0x20 3, 196, 0, 5 @@ -9,7 +9,7 @@ SFX_Battle_2A_Ch1: ; 206a9 (8:46a9) endchannel -SFX_Battle_2A_Ch2: ; 206c4 (8:46c4) +SFX_Battle_2A_Ch2: dutycycle 141 unknownsfx0x20 5, 228, 224, 5 unknownsfx0x20 4, 180, 224, 4 @@ -19,7 +19,7 @@ SFX_Battle_2A_Ch2: ; 206c4 (8:46c4) endchannel -SFX_Battle_2A_Ch3: ; 206db (8:46db) +SFX_Battle_2A_Ch3: unknownnoise0x20 5, 195, 51 unknownnoise0x20 3, 146, 67 unknownnoise0x20 10, 181, 51 diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 276627c3..6eddfa76 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,4 +1,4 @@ -SFX_Battle_2B_Ch1: ; 206ec (8:46ec) +SFX_Battle_2B_Ch1: dutycycle 210 unknownsfx0x20 3, 129, 0, 3 unknownsfx0x20 3, 193, 0, 4 @@ -10,7 +10,7 @@ SFX_Battle_2B_Ch1: ; 206ec (8:46ec) endchannel -SFX_Battle_2B_Ch2: ; 2070b (8:470b) +SFX_Battle_2B_Ch2: unknownnoise0x20 3, 98, 34 unknownnoise0x20 3, 162, 50 unknownnoise0x20 3, 210, 51 diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 22b902f1..9cd9bd16 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,4 +1,4 @@ -SFX_Battle_2C_Ch1: ; 20722 (8:4722) +SFX_Battle_2C_Ch1: dutycycle 57 unknownsfx0x20 15, 244, 0, 5 unknownsfx0x20 15, 196, 0, 4 @@ -7,7 +7,7 @@ SFX_Battle_2C_Ch1: ; 20722 (8:4722) endchannel -SFX_Battle_2C_Ch2: ; 20735 (8:4735) +SFX_Battle_2C_Ch2: dutycycle 141 unknownsfx0x20 7, 228, 48, 4 unknownsfx0x20 15, 180, 48, 3 @@ -16,7 +16,7 @@ SFX_Battle_2C_Ch2: ; 20735 (8:4735) endchannel -SFX_Battle_2C_Ch3: ; 20748 (8:4748) +SFX_Battle_2C_Ch3: unknownnoise0x20 9, 244, 68 unknownnoise0x20 9, 242, 67 unknownnoise0x20 15, 244, 66 diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index 91dda605..a0841ccf 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,4 +1,4 @@ -SFX_Battle_2E_Ch1: ; 20792 (8:4792) +SFX_Battle_2E_Ch1: duty 0 unknownsfx0x20 2, 241, 0, 2 unknownsfx0x20 3, 241, 0, 7 @@ -8,7 +8,7 @@ SFX_Battle_2E_Ch1: ; 20792 (8:4792) endchannel -SFX_Battle_2E_Ch2: ; 207a9 (8:47a9) +SFX_Battle_2E_Ch2: dutycycle 179 unknownsfx0x20 2, 225, 2, 3 unknownsfx0x20 3, 225, 242, 7 @@ -18,7 +18,7 @@ SFX_Battle_2E_Ch2: ; 207a9 (8:47a9) endchannel -SFX_Battle_2E_Ch3: ; 207c0 (8:47c0) +SFX_Battle_2E_Ch3: unknownnoise0x20 2, 211, 16 unknownnoise0x20 3, 211, 17 unknownnoise0x20 2, 210, 16 diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index 4b1d9b2c..ad607993 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,4 +1,4 @@ -SFX_Battle_2F_Ch1: ; 207d1 (8:47d1) +SFX_Battle_2F_Ch1: dutycycle 43 unknownsfx0x20 3, 241, 240, 7 unknownsfx0x20 4, 242, 0, 2 @@ -6,7 +6,7 @@ SFX_Battle_2F_Ch1: ; 207d1 (8:47d1) endchannel -SFX_Battle_2F_Ch2: ; 207e0 (8:47e0) +SFX_Battle_2F_Ch2: dutycycle 179 unknownsfx0x20 4, 226, 2, 2 unknownsfx0x20 4, 225, 226, 7 @@ -14,7 +14,7 @@ SFX_Battle_2F_Ch2: ; 207e0 (8:47e0) endchannel -SFX_Battle_2F_Ch3: ; 207ef (8:47ef) +SFX_Battle_2F_Ch3: unknownnoise0x20 4, 255, 67 unknownnoise0x20 4, 242, 68 loopchannel 9, SFX_Battle_2F_Ch3 diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index 5d3e2e40..c88cc476 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,4 +1,4 @@ -SFX_Battle_31_Ch1: ; 20847 (8:4847) +SFX_Battle_31_Ch1: duty 2 unknownsfx0x20 15, 255, 224, 7 unknownsfx0x20 15, 255, 224, 7 @@ -8,7 +8,7 @@ SFX_Battle_31_Ch1: ; 20847 (8:4847) endchannel -SFX_Battle_31_Ch2: ; 2085e (8:485e) +SFX_Battle_31_Ch2: duty 3 unknownsfx0x20 15, 255, 226, 7 unknownsfx0x20 15, 255, 225, 7 diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index c949fb5b..a85d4334 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,4 +1,4 @@ -SFX_Battle_32_Ch1: ; 20875 (8:4875) +SFX_Battle_32_Ch1: duty 2 unknownsfx0x10 175 unknownsfx0x20 8, 241, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_32_Ch1: ; 20875 (8:4875) endchannel -SFX_Battle_32_Ch2: ; 20880 (8:4880) +SFX_Battle_32_Ch2: duty 3 unknownsfx0x20 8, 241, 1, 7 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 8b2bd17d..25b1ee42 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,4 +1,4 @@ -SFX_Battle_33_Ch1: ; 20887 (8:4887) +SFX_Battle_33_Ch1: duty 2 unknownsfx0x20 6, 241, 0, 5 unknownsfx0x20 6, 241, 128, 5 @@ -8,7 +8,7 @@ SFX_Battle_33_Ch1: ; 20887 (8:4887) endchannel -SFX_Battle_33_Ch2: ; 2089e (8:489e) +SFX_Battle_33_Ch2: duty 3 unknownsfx0x20 6, 225, 16, 5 unknownsfx0x20 6, 225, 144, 5 diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index ac80eeea..14718916 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,4 +1,4 @@ -SFX_Battle_34_Ch1: ; 208b5 (8:48b5) +SFX_Battle_34_Ch1: dutycycle 237 unknownsfx0x20 8, 255, 248, 3 unknownsfx0x20 15, 255, 0, 4 @@ -6,7 +6,7 @@ SFX_Battle_34_Ch1: ; 208b5 (8:48b5) endchannel -SFX_Battle_34_Ch2: ; 208c4 (8:48c4) +SFX_Battle_34_Ch2: dutycycle 180 unknownsfx0x20 8, 239, 192, 3 unknownsfx0x20 15, 239, 192, 3 @@ -14,7 +14,7 @@ SFX_Battle_34_Ch2: ; 208c4 (8:48c4) endchannel -SFX_Battle_34_Ch3: ; 208d3 (8:48d3) +SFX_Battle_34_Ch3: unknownnoise0x20 4, 255, 81 unknownnoise0x20 8, 255, 84 unknownnoise0x20 15, 255, 85 diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 7e64aca9..2fe57bc4 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,4 +1,4 @@ -SFX_Battle_35_Ch1: ; 208e0 (8:48e0) +SFX_Battle_35_Ch1: executemusic vibrato 10, 2, 4 duty 2 @@ -13,7 +13,7 @@ SFX_Battle_35_Ch1: ; 208e0 (8:48e0) endchannel -SFX_Battle_35_Ch2: ; 208f0 (8:48f0) +SFX_Battle_35_Ch2: executemusic vibrato 10, 2, 3 duty 2 diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index f878a1c8..dcf9c56e 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,4 +1,4 @@ -SFX_Battle_36_Ch1: ; 20902 (8:4902) +SFX_Battle_36_Ch1: duty 0 unknownsfx0x20 2, 241, 128, 7 unknownsfx0x20 2, 241, 0, 7 @@ -20,7 +20,7 @@ SFX_Battle_36_branch_20930: endchannel -SFX_Battle_36_Ch2: ; 20941 (8:4941) +SFX_Battle_36_Ch2: dutycycle 179 unknownsfx0x20 2, 241, 129, 7 unknownsfx0x20 2, 241, 1, 7 @@ -40,7 +40,7 @@ SFX_Battle_36_Ch2: ; 20941 (8:4941) endchannel -SFX_Battle_36_Ch3: ; 20980 (8:4980) +SFX_Battle_36_Ch3: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 loopchannel 26, SFX_Battle_36_Ch3 diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index d841f57a..d4f3e858 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,4 +1,4 @@ -SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13) +SFX_Caught_Mon_Ch1: executemusic tempo 256 volume 7, 7 @@ -22,7 +22,7 @@ SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13) endchannel -SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e) +SFX_Caught_Mon_Ch2: executemusic duty 2 notetype 6, 12, 2 @@ -44,7 +44,7 @@ SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e) endchannel -SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44) +SFX_Caught_Mon_Ch3: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 4b9c4a7e..7a45bdf4 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,4 +1,4 @@ -SFX_Collision_1_Ch1: ; 8447 (2:4447) +SFX_Collision_1_Ch1: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 18806c1f..601670d5 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,4 +1,4 @@ -SFX_Collision_3_Ch1: ; 7c430 (1f:4430) +SFX_Collision_3_Ch1: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index f29e29ab..4fc82294 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,4 +1,4 @@ -SFX_Cry00_1_Ch1: ; 8987 (2:4987) +SFX_Cry00_1_Ch1: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_1_Ch1: ; 8987 (2:4987) endchannel -SFX_Cry00_1_Ch2: ; 8996 (2:4996) +SFX_Cry00_1_Ch2: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_1_Ch2: ; 8996 (2:4996) endchannel -SFX_Cry00_1_Ch3: ; 89a5 (2:49a5) +SFX_Cry00_1_Ch3: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index fa069f18..ccce6943 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,4 +1,4 @@ -SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f) +SFX_Cry00_2_Ch1: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f) endchannel -SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e) +SFX_Cry00_2_Ch2: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e) endchannel -SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d) +SFX_Cry00_2_Ch3: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index bdeadab5..9b8b6fda 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,4 +1,4 @@ -SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc) +SFX_Cry00_3_Ch1: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc) endchannel -SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b) +SFX_Cry00_3_Ch2: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b) endchannel -SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a) +SFX_Cry00_3_Ch3: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 835d41f7..d684af6f 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,4 +1,4 @@ -SFX_Cry01_1_Ch1: ; 8b97 (2:4b97) +SFX_Cry01_1_Ch1: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_1_Ch1: ; 8b97 (2:4b97) endchannel -SFX_Cry01_1_Ch2: ; 8baa (2:4baa) +SFX_Cry01_1_Ch2: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_1_Ch2: ; 8baa (2:4baa) endchannel -SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd) +SFX_Cry01_1_Ch3: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index bcafa873..0e1030e1 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,4 +1,4 @@ -SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f) +SFX_Cry01_2_Ch1: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f) endchannel -SFX_Cry01_2_Ch2: ; 20e52 (8:4e52) +SFX_Cry01_2_Ch2: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_2_Ch2: ; 20e52 (8:4e52) endchannel -SFX_Cry01_2_Ch3: ; 20e65 (8:4e65) +SFX_Cry01_2_Ch3: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index 1a31c7ca..be084d7e 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,4 +1,4 @@ -SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c) +SFX_Cry01_3_Ch1: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c) endchannel -SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f) +SFX_Cry01_3_Ch2: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f) endchannel -SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32) +SFX_Cry01_3_Ch3: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index 97cff95e..d4b520c9 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,4 +1,4 @@ -SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c) +SFX_Cry02_1_Ch1: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c) endchannel -SFX_Cry02_1_Ch2: ; 8b1b (2:4b1b) +SFX_Cry02_1_Ch2: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_1_Ch3: ; 8b29 (2:4b29) +SFX_Cry02_1_Ch3: endchannel diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 7d67fc4a..526e8c48 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,4 +1,4 @@ -SFX_Cry02_2_Ch1: ; 20db4 (8:4db4) +SFX_Cry02_2_Ch1: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_2_Ch1: ; 20db4 (8:4db4) endchannel -SFX_Cry02_2_Ch2: ; 20dc3 (8:4dc3) +SFX_Cry02_2_Ch2: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_2_Ch3: ; 20dd1 (8:4dd1) +SFX_Cry02_2_Ch3: endchannel diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 604d084a..2366ff97 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,4 +1,4 @@ -SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81) +SFX_Cry02_3_Ch1: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81) endchannel -SFX_Cry02_3_Ch2: ; 7cb90 (1f:4b90) +SFX_Cry02_3_Ch2: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_3_Ch3: ; 7cb9e (1f:4b9e) +SFX_Cry02_3_Ch3: endchannel diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 42f2c5d3..72ea5d38 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,4 +1,4 @@ -SFX_Cry03_1_Ch1: ; 88a6 (2:48a6) +SFX_Cry03_1_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_1_Ch1: ; 88a6 (2:48a6) endchannel -SFX_Cry03_1_Ch2: ; 88c5 (2:48c5) +SFX_Cry03_1_Ch2: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_1_Ch2: ; 88c5 (2:48c5) endchannel -SFX_Cry03_1_Ch3: ; 88e4 (2:48e4) +SFX_Cry03_1_Ch3: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 92dab482..de043909 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,4 +1,4 @@ -SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e) +SFX_Cry03_2_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e) endchannel -SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d) +SFX_Cry03_2_Ch2: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d) endchannel -SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c) +SFX_Cry03_2_Ch3: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 0161b820..467745f9 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,4 +1,4 @@ -SFX_Cry03_3_Ch1: ; 7c91b (1f:491b) +SFX_Cry03_3_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_3_Ch1: ; 7c91b (1f:491b) endchannel -SFX_Cry03_3_Ch2: ; 7c93a (1f:493a) +SFX_Cry03_3_Ch2: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_3_Ch2: ; 7c93a (1f:493a) endchannel -SFX_Cry03_3_Ch3: ; 7c959 (1f:4959) +SFX_Cry03_3_Ch3: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index c80a6bd9..2c34f1c6 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,4 +1,4 @@ -SFX_Cry04_1_Ch1: ; 8c55 (2:4c55) +SFX_Cry04_1_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_1_Ch1: ; 8c55 (2:4c55) endchannel -SFX_Cry04_1_Ch2: ; 8c74 (2:4c74) +SFX_Cry04_1_Ch2: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_1_Ch2: ; 8c74 (2:4c74) endchannel -SFX_Cry04_1_Ch3: ; 8c93 (2:4c93) +SFX_Cry04_1_Ch3: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index dcd866da..38bfbf63 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,4 +1,4 @@ -SFX_Cry04_2_Ch1: ; 20efd (8:4efd) +SFX_Cry04_2_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_2_Ch1: ; 20efd (8:4efd) endchannel -SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c) +SFX_Cry04_2_Ch2: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c) endchannel -SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b) +SFX_Cry04_2_Ch3: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index 5d8c6df9..bd73c271 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,4 +1,4 @@ -SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca) +SFX_Cry04_3_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca) endchannel -SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9) +SFX_Cry04_3_Ch2: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9) endchannel -SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08) +SFX_Cry04_3_Ch3: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 891cc50e..8de5bf02 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,4 +1,4 @@ -SFX_Cry05_1_Ch1: ; 8a35 (2:4a35) +SFX_Cry05_1_Ch1: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_1_Ch1: ; 8a35 (2:4a35) endchannel -SFX_Cry05_1_Ch2: ; 8a48 (2:4a48) +SFX_Cry05_1_Ch2: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_1_Ch2: ; 8a48 (2:4a48) unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a) +SFX_Cry05_1_Ch3: endchannel diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 98df4c1d..28879677 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,4 +1,4 @@ -SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd) +SFX_Cry05_2_Ch1: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd) endchannel -SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0) +SFX_Cry05_2_Ch2: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0) unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_2_Ch3: ; 20d02 (8:4d02) +SFX_Cry05_2_Ch3: endchannel diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index a7f88abf..261492af 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,4 +1,4 @@ -SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa) +SFX_Cry05_3_Ch1: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa) endchannel -SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd) +SFX_Cry05_3_Ch2: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd) unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf) +SFX_Cry05_3_Ch3: endchannel diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index b26004e2..e171b025 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,4 +1,4 @@ -SFX_Cry06_1_Ch1: ; 89df (2:49df) +SFX_Cry06_1_Ch1: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_1_Ch1: ; 89df (2:49df) unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_1_Ch2: ; 89f9 (2:49f9) +SFX_Cry06_1_Ch2: endchannel -SFX_Cry06_1_Ch3: ; 89fa (2:49fa) +SFX_Cry06_1_Ch3: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 283c1360..5e6e9e6a 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,4 +1,4 @@ -SFX_Cry06_2_Ch1: ; 20c87 (8:4c87) +SFX_Cry06_2_Ch1: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_2_Ch1: ; 20c87 (8:4c87) unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1) +SFX_Cry06_2_Ch2: endchannel -SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2) +SFX_Cry06_2_Ch3: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 9feecc3b..5d2994f1 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,4 +1,4 @@ -SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54) +SFX_Cry06_3_Ch1: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54) unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e) +SFX_Cry06_3_Ch2: endchannel -SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f) +SFX_Cry06_3_Ch3: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index b1346b94..e48a50a2 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,4 +1,4 @@ -SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d) +SFX_Cry07_1_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d) endchannel -SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c) +SFX_Cry07_1_Ch2: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c) endchannel -SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b) +SFX_Cry07_1_Ch3: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index 075b7139..ab902a30 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,4 +1,4 @@ -SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5) +SFX_Cry07_2_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5) endchannel -SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4) +SFX_Cry07_2_Ch2: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4) endchannel -SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3) +SFX_Cry07_2_Ch3: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index 4955e115..40fad544 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,4 +1,4 @@ -SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82) +SFX_Cry07_3_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82) endchannel -SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91) +SFX_Cry07_3_Ch2: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91) endchannel -SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0) +SFX_Cry07_3_Ch3: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 65131766..6ec5ca3c 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,4 +1,4 @@ -SFX_Cry08_1_Ch1: ; 8c25 (2:4c25) +SFX_Cry08_1_Ch1: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_1_Ch1: ; 8c25 (2:4c25) endchannel -SFX_Cry08_1_Ch2: ; 8c38 (2:4c38) +SFX_Cry08_1_Ch2: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_1_Ch2: ; 8c38 (2:4c38) endchannel -SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b) +SFX_Cry08_1_Ch3: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 71a0e205..9c154b1c 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,4 +1,4 @@ -SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd) +SFX_Cry08_2_Ch1: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd) endchannel -SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0) +SFX_Cry08_2_Ch2: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0) endchannel -SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3) +SFX_Cry08_2_Ch3: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index bfda8c3d..95fea40e 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,4 +1,4 @@ -SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a) +SFX_Cry08_3_Ch1: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a) endchannel -SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad) +SFX_Cry08_3_Ch2: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad) endchannel -SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0) +SFX_Cry08_3_Ch3: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 29dffdb6..46aae33c 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,4 +1,4 @@ -SFX_Cry09_1_Ch1: ; 872f (2:472f) +SFX_Cry09_1_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_1_Ch1: ; 872f (2:472f) endchannel -SFX_Cry09_1_Ch2: ; 874c (2:474c) +SFX_Cry09_1_Ch2: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_1_Ch2: ; 874c (2:474c) endchannel -SFX_Cry09_1_Ch3: ; 876d (2:476d) +SFX_Cry09_1_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index c0e61ec7..8ce97609 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,4 +1,4 @@ -SFX_Cry09_2_Ch1: ; 209d7 (8:49d7) +SFX_Cry09_2_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_2_Ch1: ; 209d7 (8:49d7) endchannel -SFX_Cry09_2_Ch2: ; 209f4 (8:49f4) +SFX_Cry09_2_Ch2: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_2_Ch2: ; 209f4 (8:49f4) endchannel -SFX_Cry09_2_Ch3: ; 20a15 (8:4a15) +SFX_Cry09_2_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index c5c0f599..a6b40dde 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,4 +1,4 @@ -SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4) +SFX_Cry09_3_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4) endchannel -SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1) +SFX_Cry09_3_Ch2: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1) endchannel -SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2) +SFX_Cry09_3_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 9a8e616b..4264e858 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_1_Ch1: ; 8bca (2:4bca) +SFX_Cry0A_1_Ch1: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_1_Ch1: ; 8bca (2:4bca) endchannel -SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9) +SFX_Cry0A_1_Ch2: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9) endchannel -SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c) +SFX_Cry0A_1_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index 0386099d..42a8e603 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72) +SFX_Cry0A_2_Ch1: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72) endchannel -SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91) +SFX_Cry0A_2_Ch2: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91) endchannel -SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4) +SFX_Cry0A_2_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index 4cf59333..f8576fa1 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f) +SFX_Cry0A_3_Ch1: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f) endchannel -SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e) +SFX_Cry0A_3_Ch2: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e) endchannel -SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81) +SFX_Cry0A_3_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index 0f0edca7..d0da6c2e 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b) +SFX_Cry0B_1_Ch1: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b) endchannel -SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86) +SFX_Cry0B_1_Ch2: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86) endchannel -SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5) +SFX_Cry0B_1_Ch3: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 071cd9b1..0fe7840a 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03) +SFX_Cry0B_2_Ch1: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03) endchannel -SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e) +SFX_Cry0B_2_Ch2: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e) endchannel -SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d) +SFX_Cry0B_2_Ch3: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index c2bd1809..ff761b85 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0) +SFX_Cry0B_3_Ch1: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0) endchannel -SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb) +SFX_Cry0B_3_Ch2: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb) endchannel -SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a) +SFX_Cry0B_3_Ch3: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 1c0f9f65..4ff72662 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_1_Ch1: ; 8abe (2:4abe) +SFX_Cry0C_1_Ch1: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_1_Ch1: ; 8abe (2:4abe) endchannel -SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5) +SFX_Cry0C_1_Ch2: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5) unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b) +SFX_Cry0C_1_Ch3: endchannel diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index ef598b3e..8fb925da 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66) +SFX_Cry0C_2_Ch1: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66) endchannel -SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d) +SFX_Cry0C_2_Ch2: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d) unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3) +SFX_Cry0C_2_Ch3: endchannel diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 4075ac51..149b585d 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33) +SFX_Cry0C_3_Ch1: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33) endchannel -SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a) +SFX_Cry0C_3_Ch2: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a) unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80) +SFX_Cry0C_3_Ch3: endchannel diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index 591bf58e..dccccb4e 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a) +SFX_Cry0D_1_Ch1: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -10,7 +10,7 @@ SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a) endchannel -SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49) +SFX_Cry0D_1_Ch2: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49) endchannel -SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78) +SFX_Cry0D_1_Ch3: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index a7ca34f1..718364dd 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2) +SFX_Cry0D_2_Ch1: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -10,7 +10,7 @@ SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2) endchannel -SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1) +SFX_Cry0D_2_Ch2: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1) endchannel -SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20) +SFX_Cry0D_2_Ch3: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index a9187dc8..ce26e7e5 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f) +SFX_Cry0D_3_Ch1: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -10,7 +10,7 @@ SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f) endchannel -SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe) +SFX_Cry0D_3_Ch2: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe) endchannel -SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed) +SFX_Cry0D_3_Ch3: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index 1e778dea..c30aaf20 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_1_Ch1: ; 89af (2:49af) +SFX_Cry0E_1_Ch1: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_1_Ch1: ; 89af (2:49af) endchannel -SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2) +SFX_Cry0E_1_Ch2: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2) endchannel -SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5) +SFX_Cry0E_1_Ch3: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index bab74449..194fb04b 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57) +SFX_Cry0E_2_Ch1: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57) endchannel -SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a) +SFX_Cry0E_2_Ch2: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a) endchannel -SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d) +SFX_Cry0E_2_Ch3: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index da14b3a7..062e8970 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24) +SFX_Cry0E_3_Ch1: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24) endchannel -SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37) +SFX_Cry0E_3_Ch2: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37) endchannel -SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a) +SFX_Cry0E_3_Ch3: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 84563293..1646d4b5 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1) +SFX_Cry0F_1_Ch1: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1) endchannel -SFX_Cry0F_1_Ch2: ; 890c (2:490c) +SFX_Cry0F_1_Ch2: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_1_Ch2: ; 890c (2:490c) endchannel -SFX_Cry0F_1_Ch3: ; 8927 (2:4927) +SFX_Cry0F_1_Ch3: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 0fbaeb7a..6058e7cc 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99) +SFX_Cry0F_2_Ch1: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99) endchannel -SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4) +SFX_Cry0F_2_Ch2: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4) endchannel -SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf) +SFX_Cry0F_2_Ch3: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 810ab949..113f5ed1 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966) +SFX_Cry0F_3_Ch1: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966) endchannel -SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981) +SFX_Cry0F_3_Ch2: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981) endchannel -SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c) +SFX_Cry0F_3_Ch3: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 956fc910..5199b973 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,4 +1,4 @@ -SFX_Cry10_1_Ch1: ; 8937 (2:4937) +SFX_Cry10_1_Ch1: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_1_Ch1: ; 8937 (2:4937) endchannel -SFX_Cry10_1_Ch2: ; 895a (2:495a) +SFX_Cry10_1_Ch2: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_1_Ch2: ; 895a (2:495a) endchannel -SFX_Cry10_1_Ch3: ; 897d (2:497d) +SFX_Cry10_1_Ch3: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 5d4cc3aa..789c61b1 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,4 +1,4 @@ -SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf) +SFX_Cry10_2_Ch1: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf) endchannel -SFX_Cry10_2_Ch2: ; 20c02 (8:4c02) +SFX_Cry10_2_Ch2: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_2_Ch2: ; 20c02 (8:4c02) endchannel -SFX_Cry10_2_Ch3: ; 20c25 (8:4c25) +SFX_Cry10_2_Ch3: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 2d5df465..83980fc7 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,4 +1,4 @@ -SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac) +SFX_Cry10_3_Ch1: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac) endchannel -SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf) +SFX_Cry10_3_Ch2: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf) endchannel -SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2) +SFX_Cry10_3_Ch3: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index dd354c90..d7e0b0f9 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,4 +1,4 @@ -SFX_Cry11_1_Ch1: ; 8813 (2:4813) +SFX_Cry11_1_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_1_Ch1: ; 8813 (2:4813) endchannel -SFX_Cry11_1_Ch2: ; 8832 (2:4832) +SFX_Cry11_1_Ch2: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_1_Ch2: ; 8832 (2:4832) endchannel -SFX_Cry11_1_Ch3: ; 8855 (2:4855) +SFX_Cry11_1_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 37546fe1..f46580eb 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,4 +1,4 @@ -SFX_Cry11_2_Ch1: ; 20abb (8:4abb) +SFX_Cry11_2_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_2_Ch1: ; 20abb (8:4abb) endchannel -SFX_Cry11_2_Ch2: ; 20ada (8:4ada) +SFX_Cry11_2_Ch2: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_2_Ch2: ; 20ada (8:4ada) endchannel -SFX_Cry11_2_Ch3: ; 20afd (8:4afd) +SFX_Cry11_2_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index 75b9a861..c07e01a5 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,4 +1,4 @@ -SFX_Cry11_3_Ch1: ; 7c888 (1f:4888) +SFX_Cry11_3_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_3_Ch1: ; 7c888 (1f:4888) endchannel -SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7) +SFX_Cry11_3_Ch2: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7) endchannel -SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca) +SFX_Cry11_3_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index a6b1a0f8..62956626 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,4 +1,4 @@ -SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b) +SFX_Cry12_1_Ch1: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b) endchannel -SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e) +SFX_Cry12_1_Ch2: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e) endchannel -SFX_Cry12_1_Ch3: ; 8d51 (2:4d51) +SFX_Cry12_1_Ch3: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index e2b29de7..4acb8911 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,4 +1,4 @@ -SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3) +SFX_Cry12_2_Ch1: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3) endchannel -SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6) +SFX_Cry12_2_Ch2: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6) endchannel -SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9) +SFX_Cry12_2_Ch3: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index 143f8045..bb433ac9 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,4 +1,4 @@ -SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0) +SFX_Cry12_3_Ch1: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0) endchannel -SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3) +SFX_Cry12_3_Ch2: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3) endchannel -SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6) +SFX_Cry12_3_Ch3: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index c2f1002f..7f9ef226 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,4 +1,4 @@ -SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e) +SFX_Cry13_1_Ch1: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e) endchannel -SFX_Cry13_1_Ch2: ; 8d79 (2:4d79) +SFX_Cry13_1_Ch2: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_1_Ch2: ; 8d79 (2:4d79) endchannel -SFX_Cry13_1_Ch3: ; 8d94 (2:4d94) +SFX_Cry13_1_Ch3: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index b072fb07..35d723dd 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,4 +1,4 @@ -SFX_Cry13_2_Ch1: ; 21006 (8:5006) +SFX_Cry13_2_Ch1: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_2_Ch1: ; 21006 (8:5006) endchannel -SFX_Cry13_2_Ch2: ; 21021 (8:5021) +SFX_Cry13_2_Ch2: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_2_Ch2: ; 21021 (8:5021) endchannel -SFX_Cry13_2_Ch3: ; 2103c (8:503c) +SFX_Cry13_2_Ch3: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index f2c110b8..a298e5ff 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,4 +1,4 @@ -SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3) +SFX_Cry13_3_Ch1: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3) endchannel -SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee) +SFX_Cry13_3_Ch2: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee) endchannel -SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09) +SFX_Cry13_3_Ch3: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index 125fe86e..b3cb43b9 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,4 +1,4 @@ -SFX_Cry14_1_Ch1: ; 8da7 (2:4da7) +SFX_Cry14_1_Ch1: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_1_Ch1: ; 8da7 (2:4da7) endchannel -SFX_Cry14_1_Ch2: ; 8db6 (2:4db6) +SFX_Cry14_1_Ch2: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_1_Ch2: ; 8db6 (2:4db6) endchannel -SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5) +SFX_Cry14_1_Ch3: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 3ba2ac26..d243bcbd 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,4 +1,4 @@ -SFX_Cry14_2_Ch1: ; 2104f (8:504f) +SFX_Cry14_2_Ch1: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_2_Ch1: ; 2104f (8:504f) endchannel -SFX_Cry14_2_Ch2: ; 2105e (8:505e) +SFX_Cry14_2_Ch2: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_2_Ch2: ; 2105e (8:505e) endchannel -SFX_Cry14_2_Ch3: ; 2106d (8:506d) +SFX_Cry14_2_Ch3: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index fe2cd1e8..b1a32bc4 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,4 +1,4 @@ -SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c) +SFX_Cry14_3_Ch1: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c) endchannel -SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b) +SFX_Cry14_3_Ch2: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b) endchannel -SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a) +SFX_Cry14_3_Ch3: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 54f94deb..4ebd4963 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,4 +1,4 @@ -SFX_Cry15_1_Ch1: ; 8e35 (2:4e35) +SFX_Cry15_1_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_1_Ch1: ; 8e35 (2:4e35) endchannel -SFX_Cry15_1_Ch2: ; 8e50 (2:4e50) +SFX_Cry15_1_Ch2: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_1_Ch2: ; 8e50 (2:4e50) endchannel -SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b) +SFX_Cry15_1_Ch3: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 14b1af72..77807203 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,4 +1,4 @@ -SFX_Cry15_2_Ch1: ; 210dd (8:50dd) +SFX_Cry15_2_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_2_Ch1: ; 210dd (8:50dd) endchannel -SFX_Cry15_2_Ch2: ; 210f8 (8:50f8) +SFX_Cry15_2_Ch2: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_2_Ch2: ; 210f8 (8:50f8) endchannel -SFX_Cry15_2_Ch3: ; 21113 (8:5113) +SFX_Cry15_2_Ch3: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 36951439..2c24d658 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,4 +1,4 @@ -SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa) +SFX_Cry15_3_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa) endchannel -SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5) +SFX_Cry15_3_Ch2: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5) endchannel -SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0) +SFX_Cry15_3_Ch3: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 91fa2596..8a7ee4c1 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,4 +1,4 @@ -SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8) +SFX_Cry16_1_Ch1: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8) endchannel -SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7) +SFX_Cry16_1_Ch2: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7) endchannel -SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6) +SFX_Cry16_1_Ch3: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 5e29eba8..46729c2a 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,4 +1,4 @@ -SFX_Cry16_2_Ch1: ; 20f70 (8:4f70) +SFX_Cry16_2_Ch1: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_2_Ch1: ; 20f70 (8:4f70) endchannel -SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f) +SFX_Cry16_2_Ch2: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f) endchannel -SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e) +SFX_Cry16_2_Ch3: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index af32e9ef..a94ac495 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,4 +1,4 @@ -SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d) +SFX_Cry16_3_Ch1: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d) endchannel -SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c) +SFX_Cry16_3_Ch2: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c) endchannel -SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b) +SFX_Cry16_3_Ch3: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 2f2cde11..ddf0967d 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,4 +1,4 @@ -SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e) +SFX_Cry17_1_Ch1: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e) endchannel -SFX_Cry17_1_Ch2: ; 8e91 (2:4e91) +SFX_Cry17_1_Ch2: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_1_Ch2: ; 8e91 (2:4e91) endchannel -SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4) +SFX_Cry17_1_Ch3: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index cca78ae2..f2528875 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,4 +1,4 @@ -SFX_Cry17_2_Ch1: ; 21126 (8:5126) +SFX_Cry17_2_Ch1: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_2_Ch1: ; 21126 (8:5126) endchannel -SFX_Cry17_2_Ch2: ; 21139 (8:5139) +SFX_Cry17_2_Ch2: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_2_Ch2: ; 21139 (8:5139) endchannel -SFX_Cry17_2_Ch3: ; 2114c (8:514c) +SFX_Cry17_2_Ch3: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index 6aad35d0..f180a3b8 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,4 +1,4 @@ -SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3) +SFX_Cry17_3_Ch1: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3) endchannel -SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06) +SFX_Cry17_3_Ch2: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06) endchannel -SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19) +SFX_Cry17_3_Ch3: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index 576ea693..c28bf7f4 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,4 +1,4 @@ -SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e) +SFX_Cry18_1_Ch1: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e) endchannel -SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1) +SFX_Cry18_1_Ch2: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1) endchannel -SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4) +SFX_Cry18_1_Ch3: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 333ddb9e..1c3c26b9 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,4 +1,4 @@ -SFX_Cry18_2_Ch1: ; 21236 (8:5236) +SFX_Cry18_2_Ch1: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_2_Ch1: ; 21236 (8:5236) endchannel -SFX_Cry18_2_Ch2: ; 21259 (8:5259) +SFX_Cry18_2_Ch2: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_2_Ch2: ; 21259 (8:5259) endchannel -SFX_Cry18_2_Ch3: ; 2127c (8:527c) +SFX_Cry18_2_Ch3: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index 3c7b1a99..ceeda42f 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,4 +1,4 @@ -SFX_Cry18_3_Ch1: ; 7d003 (1f:5003) +SFX_Cry18_3_Ch1: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_3_Ch1: ; 7d003 (1f:5003) endchannel -SFX_Cry18_3_Ch2: ; 7d026 (1f:5026) +SFX_Cry18_3_Ch2: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_3_Ch2: ; 7d026 (1f:5026) endchannel -SFX_Cry18_3_Ch3: ; 7d049 (1f:5049) +SFX_Cry18_3_Ch3: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 94607b9b..4b5b4ed0 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,4 +1,4 @@ -SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6) +SFX_Cry19_1_Ch1: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6) endchannel -SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5) +SFX_Cry19_1_Ch2: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5) unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7) +SFX_Cry19_1_Ch3: endchannel diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index 717a5d2b..9c9557a9 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,4 +1,4 @@ -SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e) +SFX_Cry19_2_Ch1: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e) endchannel -SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d) +SFX_Cry19_2_Ch2: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d) unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f) +SFX_Cry19_2_Ch3: endchannel diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 535be2b6..71eccbf8 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,4 +1,4 @@ -SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b) +SFX_Cry19_3_Ch1: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b) endchannel -SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a) +SFX_Cry19_3_Ch2: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a) unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c) +SFX_Cry19_3_Ch3: endchannel diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 0217deef..7f8911c7 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_1_Ch1: ; 8eff (2:4eff) +SFX_Cry1A_1_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_1_Ch1: ; 8eff (2:4eff) endchannel -SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a) +SFX_Cry1A_1_Ch2: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a) endchannel -SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35) +SFX_Cry1A_1_Ch3: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index c94fc657..da54ff6e 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7) +SFX_Cry1A_2_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7) endchannel -SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2) +SFX_Cry1A_2_Ch2: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2) endchannel -SFX_Cry1A_2_Ch3: ; 211dd (8:51dd) +SFX_Cry1A_2_Ch3: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index 29ff2ec0..d16cf035 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74) +SFX_Cry1A_3_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74) endchannel -SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f) +SFX_Cry1A_3_Ch2: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f) endchannel -SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa) +SFX_Cry1A_3_Ch3: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 858d724a..f6f03c98 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0) +SFX_Cry1B_1_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0) endchannel -SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07) +SFX_Cry1B_1_Ch2: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07) endchannel -SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e) +SFX_Cry1B_1_Ch3: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index 423258ee..fe96943d 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98) +SFX_Cry1B_2_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98) endchannel -SFX_Cry1B_2_Ch2: ; 20faf (8:4faf) +SFX_Cry1B_2_Ch2: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_2_Ch2: ; 20faf (8:4faf) endchannel -SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6) +SFX_Cry1B_2_Ch3: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 7fe6019f..8a034b1e 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65) +SFX_Cry1B_3_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65) endchannel -SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c) +SFX_Cry1B_3_Ch2: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c) endchannel -SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93) +SFX_Cry1B_3_Ch3: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index f7e66dfb..1561353e 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1) +SFX_Cry1C_1_Ch1: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1) endchannel -SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4) +SFX_Cry1C_1_Ch2: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4) endchannel -SFX_Cry1C_1_Ch3: ; 8eef (2:4eef) +SFX_Cry1C_1_Ch3: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index 8037fc96..c589a24d 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_2_Ch1: ; 21159 (8:5159) +SFX_Cry1C_2_Ch1: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_2_Ch1: ; 21159 (8:5159) endchannel -SFX_Cry1C_2_Ch2: ; 2117c (8:517c) +SFX_Cry1C_2_Ch2: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_2_Ch2: ; 2117c (8:517c) endchannel -SFX_Cry1C_2_Ch3: ; 21197 (8:5197) +SFX_Cry1C_2_Ch3: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 853eb1c6..930e3368 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26) +SFX_Cry1C_3_Ch1: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26) endchannel -SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49) +SFX_Cry1C_3_Ch2: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49) endchannel -SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64) +SFX_Cry1C_3_Ch3: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 6e2818c1..6b8b3f79 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48) +SFX_Cry1D_1_Ch1: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48) endchannel -SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63) +SFX_Cry1D_1_Ch2: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63) endchannel -SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e) +SFX_Cry1D_1_Ch3: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index c7a2c512..31fccb8d 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0) +SFX_Cry1D_2_Ch1: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0) endchannel -SFX_Cry1D_2_Ch2: ; 2120b (8:520b) +SFX_Cry1D_2_Ch2: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_2_Ch2: ; 2120b (8:520b) endchannel -SFX_Cry1D_2_Ch3: ; 21226 (8:5226) +SFX_Cry1D_2_Ch3: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index 7210406c..fbbe9ca5 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd) +SFX_Cry1D_3_Ch1: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd) endchannel -SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8) +SFX_Cry1D_3_Ch2: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8) endchannel -SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3) +SFX_Cry1D_3_Ch3: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index e445fdd7..9501a06a 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf) +SFX_Cry1E_1_Ch1: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf) endchannel -SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2) +SFX_Cry1E_1_Ch2: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2) endchannel -SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19) +SFX_Cry1E_1_Ch3: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index 59c9985f..fe112101 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_2_Ch1: ; 21077 (8:5077) +SFX_Cry1E_2_Ch1: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_2_Ch1: ; 21077 (8:5077) endchannel -SFX_Cry1E_2_Ch2: ; 2109a (8:509a) +SFX_Cry1E_2_Ch2: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_2_Ch2: ; 2109a (8:509a) endchannel -SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1) +SFX_Cry1E_2_Ch3: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index 1c50d4b8..f5bdbe08 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44) +SFX_Cry1E_3_Ch1: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44) endchannel -SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67) +SFX_Cry1E_3_Ch2: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67) endchannel -SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e) +SFX_Cry1E_3_Ch3: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index 52be80df..28b91c61 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7) +SFX_Cry1F_1_Ch1: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7) endchannel -SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa) +SFX_Cry1F_1_Ch2: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa) endchannel -SFX_Cry1F_1_Ch3: ; 900d (2:500d) +SFX_Cry1F_1_Ch3: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index da7df61a..9691654f 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_2_Ch1: ; 2128f (8:528f) +SFX_Cry1F_2_Ch1: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_2_Ch1: ; 2128f (8:528f) endchannel -SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2) +SFX_Cry1F_2_Ch2: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2) endchannel -SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5) +SFX_Cry1F_2_Ch3: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 2f6c1eda..3c50327b 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c) +SFX_Cry1F_3_Ch1: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c) endchannel -SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f) +SFX_Cry1F_3_Ch2: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f) endchannel -SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082) +SFX_Cry1F_3_Ch3: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index d6586bdd..0e9ffb00 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,4 +1,4 @@ -SFX_Cry20_1_Ch1: ; 901a (2:501a) +SFX_Cry20_1_Ch1: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_1_Ch1: ; 901a (2:501a) endchannel -SFX_Cry20_1_Ch2: ; 902d (2:502d) +SFX_Cry20_1_Ch2: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_1_Ch2: ; 902d (2:502d) endchannel -SFX_Cry20_1_Ch3: ; 9040 (2:5040) +SFX_Cry20_1_Ch3: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index b345eba5..91891b4f 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,4 +1,4 @@ -SFX_Cry20_2_Ch1: ; 212c2 (8:52c2) +SFX_Cry20_2_Ch1: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_2_Ch1: ; 212c2 (8:52c2) endchannel -SFX_Cry20_2_Ch2: ; 212d5 (8:52d5) +SFX_Cry20_2_Ch2: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_2_Ch2: ; 212d5 (8:52d5) endchannel -SFX_Cry20_2_Ch3: ; 212e8 (8:52e8) +SFX_Cry20_2_Ch3: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 5bcdf3df..1fae1bb3 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,4 +1,4 @@ -SFX_Cry20_3_Ch1: ; 7d08f (1f:508f) +SFX_Cry20_3_Ch1: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_3_Ch1: ; 7d08f (1f:508f) endchannel -SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2) +SFX_Cry20_3_Ch2: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2) endchannel -SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5) +SFX_Cry20_3_Ch3: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 9b81e2a3..17d1e16c 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,4 +1,4 @@ -SFX_Cry21_1_Ch1: ; 904d (2:504d) +SFX_Cry21_1_Ch1: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_1_Ch1: ; 904d (2:504d) endchannel -SFX_Cry21_1_Ch2: ; 9070 (2:5070) +SFX_Cry21_1_Ch2: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_1_Ch2: ; 9070 (2:5070) unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_1_Ch3: ; 9092 (2:5092) +SFX_Cry21_1_Ch3: endchannel diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index f5571642..14856fc9 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,4 +1,4 @@ -SFX_Cry21_2_Ch1: ; 212f5 (8:52f5) +SFX_Cry21_2_Ch1: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_2_Ch1: ; 212f5 (8:52f5) endchannel -SFX_Cry21_2_Ch2: ; 21318 (8:5318) +SFX_Cry21_2_Ch2: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_2_Ch2: ; 21318 (8:5318) unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_2_Ch3: ; 2133a (8:533a) +SFX_Cry21_2_Ch3: endchannel diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index d91177b8..40cbf7f2 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,4 +1,4 @@ -SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2) +SFX_Cry21_3_Ch1: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2) endchannel -SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5) +SFX_Cry21_3_Ch2: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5) unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_3_Ch3: ; 7d107 (1f:5107) +SFX_Cry21_3_Ch3: endchannel diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 90961298..fb0c6b23 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,4 +1,4 @@ -SFX_Cry22_1_Ch1: ; 9093 (2:5093) +SFX_Cry22_1_Ch1: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_1_Ch1: ; 9093 (2:5093) endchannel -SFX_Cry22_1_Ch2: ; 90a6 (2:50a6) +SFX_Cry22_1_Ch2: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_1_Ch2: ; 90a6 (2:50a6) endchannel -SFX_Cry22_1_Ch3: ; 90b9 (2:50b9) +SFX_Cry22_1_Ch3: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 861c3bfb..7653234e 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,4 +1,4 @@ -SFX_Cry22_2_Ch1: ; 2133b (8:533b) +SFX_Cry22_2_Ch1: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_2_Ch1: ; 2133b (8:533b) endchannel -SFX_Cry22_2_Ch2: ; 2134e (8:534e) +SFX_Cry22_2_Ch2: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_2_Ch2: ; 2134e (8:534e) endchannel -SFX_Cry22_2_Ch3: ; 21361 (8:5361) +SFX_Cry22_2_Ch3: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 42b3039c..96fae832 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,4 +1,4 @@ -SFX_Cry22_3_Ch1: ; 7d108 (1f:5108) +SFX_Cry22_3_Ch1: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_3_Ch1: ; 7d108 (1f:5108) endchannel -SFX_Cry22_3_Ch2: ; 7d11b (1f:511b) +SFX_Cry22_3_Ch2: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_3_Ch2: ; 7d11b (1f:511b) endchannel -SFX_Cry22_3_Ch3: ; 7d12e (1f:512e) +SFX_Cry22_3_Ch3: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 02868042..4aaa3bfa 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,4 +1,4 @@ -SFX_Cry23_1_Ch1: ; 8786 (2:4786) +SFX_Cry23_1_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_1_Ch1: ; 8786 (2:4786) endchannel -SFX_Cry23_1_Ch2: ; 879d (2:479d) +SFX_Cry23_1_Ch2: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_1_Ch2: ; 879d (2:479d) endchannel -SFX_Cry23_1_Ch3: ; 87b0 (2:47b0) +SFX_Cry23_1_Ch3: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 089a233c..644b14cf 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,4 +1,4 @@ -SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e) +SFX_Cry23_2_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e) endchannel -SFX_Cry23_2_Ch2: ; 20a45 (8:4a45) +SFX_Cry23_2_Ch2: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_2_Ch2: ; 20a45 (8:4a45) endchannel -SFX_Cry23_2_Ch3: ; 20a58 (8:4a58) +SFX_Cry23_2_Ch3: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index 31ba3743..d86dfcd4 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,4 +1,4 @@ -SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb) +SFX_Cry23_3_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb) endchannel -SFX_Cry23_3_Ch2: ; 7c812 (1f:4812) +SFX_Cry23_3_Ch2: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_3_Ch2: ; 7c812 (1f:4812) endchannel -SFX_Cry23_3_Ch3: ; 7c825 (1f:4825) +SFX_Cry23_3_Ch3: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index 061ed65a..a94803c1 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,4 +1,4 @@ -SFX_Cry24_1_Ch1: ; 87bd (2:47bd) +SFX_Cry24_1_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_1_Ch1: ; 87bd (2:47bd) endchannel -SFX_Cry24_1_Ch2: ; 87e0 (2:47e0) +SFX_Cry24_1_Ch2: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_1_Ch2: ; 87e0 (2:47e0) endchannel -SFX_Cry24_1_Ch3: ; 8803 (2:4803) +SFX_Cry24_1_Ch3: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index 52986829..cc8b2f87 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,4 +1,4 @@ -SFX_Cry24_2_Ch1: ; 20a65 (8:4a65) +SFX_Cry24_2_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_2_Ch1: ; 20a65 (8:4a65) endchannel -SFX_Cry24_2_Ch2: ; 20a88 (8:4a88) +SFX_Cry24_2_Ch2: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_2_Ch2: ; 20a88 (8:4a88) endchannel -SFX_Cry24_2_Ch3: ; 20aab (8:4aab) +SFX_Cry24_2_Ch3: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 8c9cfc81..37926146 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,4 +1,4 @@ -SFX_Cry24_3_Ch1: ; 7c832 (1f:4832) +SFX_Cry24_3_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_3_Ch1: ; 7c832 (1f:4832) endchannel -SFX_Cry24_3_Ch2: ; 7c855 (1f:4855) +SFX_Cry24_3_Ch2: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_3_Ch2: ; 7c855 (1f:4855) endchannel -SFX_Cry24_3_Ch3: ; 7c878 (1f:4878) +SFX_Cry24_3_Ch3: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index ce238db2..d54b8d6c 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,4 +1,4 @@ -SFX_Cry25_1_Ch1: ; 886b (2:486b) +SFX_Cry25_1_Ch1: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_1_Ch1: ; 886b (2:486b) endchannel -SFX_Cry25_1_Ch2: ; 8882 (2:4882) +SFX_Cry25_1_Ch2: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_1_Ch2: ; 8882 (2:4882) endchannel -SFX_Cry25_1_Ch3: ; 8899 (2:4899) +SFX_Cry25_1_Ch3: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index b00210a9..48e4d057 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,4 +1,4 @@ -SFX_Cry25_2_Ch1: ; 20b13 (8:4b13) +SFX_Cry25_2_Ch1: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_2_Ch1: ; 20b13 (8:4b13) endchannel -SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a) +SFX_Cry25_2_Ch2: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a) endchannel -SFX_Cry25_2_Ch3: ; 20b41 (8:4b41) +SFX_Cry25_2_Ch3: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index 7c93b0e6..f08c6a00 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,4 +1,4 @@ -SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0) +SFX_Cry25_3_Ch1: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0) endchannel -SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7) +SFX_Cry25_3_Ch2: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7) endchannel -SFX_Cry25_3_Ch3: ; 7c90e (1f:490e) +SFX_Cry25_3_Ch3: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index c1b763e0..a42cd660 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,4 +1,4 @@ -SFX_Cut_1_Ch1: ; 83e1 (2:43e1) +SFX_Cut_1_Ch1: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 4ad5551d..12c2366e 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,4 +1,4 @@ -SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca) +SFX_Cut_3_Ch1: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index d001b750..3f3c6d8b 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_1_Ch1: ; 833b (2:433b) +SFX_Cymbal1_1_Ch1: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index 8987d85f..bb1e3e3e 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_2_Ch1: ; 2033b (8:433b) +SFX_Cymbal1_2_Ch1: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 597a8b61..9587977f 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b) +SFX_Cymbal1_3_Ch1: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index 3f50299a..2ec3fc86 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_1_Ch1: ; 833f (2:433f) +SFX_Cymbal2_1_Ch1: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index 5224a20d..8b27a0de 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_2_Ch1: ; 2033f (8:433f) +SFX_Cymbal2_2_Ch1: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index dd3a4fc9..642a336a 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f) +SFX_Cymbal2_3_Ch1: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index 8aa5ebe5..3fd225e2 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_1_Ch1: ; 8343 (2:4343) +SFX_Cymbal3_1_Ch1: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index d1fd3b90..1435b5ed 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_2_Ch1: ; 20343 (8:4343) +SFX_Cymbal3_2_Ch1: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index 45e41c15..b45fb03d 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343) +SFX_Cymbal3_3_Ch1: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index 4022fcbf..ea2727d8 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,4 +1,4 @@ -SFX_Damage_Ch1: ; 204f4 (8:44f4) +SFX_Damage_Ch1: unknownnoise0x20 2, 244, 68 unknownnoise0x20 2, 244, 20 unknownnoise0x20 15, 241, 50 diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index 46520151..d954308a 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,4 +1,4 @@ -SFX_Denied_1_Ch1: ; 861f (2:461f) +SFX_Denied_1_Ch1: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_1_Ch1: ; 861f (2:461f) endchannel -SFX_Denied_1_Ch2: ; 8636 (2:4636) +SFX_Denied_1_Ch2: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index 2cebd766..ca82a739 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,4 +1,4 @@ -SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc) +SFX_Denied_3_Ch1: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc) endchannel -SFX_Denied_3_Ch2: ; 7c613 (1f:4613) +SFX_Denied_3_Ch2: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index dac55ed9..6e3a0dcf 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,4 +1,4 @@ -SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f) +SFX_Dex_Page_Added_Ch1: duty 2 unknownsfx0x10 68 unknownsfx0x20 15, 240, 240, 4 @@ -8,7 +8,7 @@ SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f) endchannel -SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490) +SFX_Dex_Page_Added_Ch2: duty 2 unknownsfx0x20 15, 146, 0, 6 unknownsfx0x20 15, 146, 130, 7 diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 0918238a..5cae0a4b 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch1: ; 2058c (8:458c) +SFX_Doubleslap_Ch1: unknownnoise0x20 8, 241, 50 unknownnoise0x20 8, 241, 51 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index 5c1a189a..b2450ced 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_1_Ch1: ; 853b (2:453b) +SFX_Enter_PC_1_Ch1: duty 2 unknownsfx0x20 6, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index 5907a7e5..061068ce 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518) +SFX_Enter_PC_3_Ch1: duty 2 unknownsfx0x20 4, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index c252b93a..cd1b2cdc 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,4 +1,4 @@ -SFX_Faint_Fall_Ch1: ; 204ae (8:44ae) +SFX_Faint_Fall_Ch1: duty 1 unknownsfx0x10 175 unknownsfx0x20 15, 242, 128, 7 diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 5ef100c5..7b6ec0a0 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,10 +1,10 @@ -SFX_Faint_Thud_Ch1: ; 2044c (8:444c) +SFX_Faint_Thud_Ch1: unknownsfx0x20 15, 209, 0, 2 unknownsfx0x10 8 endchannel -SFX_Faint_Thud_Ch2: ; 20453 (8:4453) +SFX_Faint_Thud_Ch2: unknownnoise0x20 4, 245, 51 unknownnoise0x20 8, 244, 34 unknownnoise0x20 15, 242, 33 diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index c2ecf435..2b487bc2 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,4 +1,4 @@ -SFX_Fly_1_Ch1: ; 85ee (2:45ee) +SFX_Fly_1_Ch1: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index 043d4b51..c081030d 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,4 +1,4 @@ -SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb) +SFX_Fly_3_Ch1: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index 471124d7..ba428722 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77) +SFX_Get_Item1_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77) endchannel -SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e) +SFX_Get_Item1_1_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e) endchannel -SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e) +SFX_Get_Item1_1_Ch3: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index 6a7ebabc..b30ce40c 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850) +SFX_Get_Item1_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850) endchannel -SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867) +SFX_Get_Item1_3_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867) endchannel -SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877) +SFX_Get_Item1_3_Ch3: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 6fda3404..67bb7bb8 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_1_Ch1: ; b316 (2:7316) +SFX_Get_Item2_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_1_Ch1: ; b316 (2:7316) endchannel -SFX_Get_Item2_1_Ch2: ; b335 (2:7335) +SFX_Get_Item2_1_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_1_Ch2: ; b335 (2:7335) endchannel -SFX_Get_Item2_1_Ch3: ; b34d (2:734d) +SFX_Get_Item2_1_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index 25e40744..292a74f6 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7) +SFX_Get_Item2_2_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7) endchannel -SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6) +SFX_Get_Item2_2_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6) endchannel -SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe) +SFX_Get_Item2_2_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 20a0ee04..1a833741 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28) +SFX_Get_Item2_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28) endchannel -SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47) +SFX_Get_Item2_3_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47) endchannel -SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f) +SFX_Get_Item2_3_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index 233ea01b..c8da1745 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362) +SFX_Get_Key_Item_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362) endchannel -SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381) +SFX_Get_Key_Item_1_Ch2: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381) endchannel -SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d) +SFX_Get_Key_Item_1_Ch3: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index f918e1bf..e6a50929 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74) +SFX_Get_Key_Item_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74) endchannel -SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93) +SFX_Get_Key_Item_3_Ch2: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93) endchannel -SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf) +SFX_Get_Key_Item_3_Ch3: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index 1eb1e2ca..5da5be86 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1) +SFX_Go_Inside_1_Ch1: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index d8e18b7d..460b3b4a 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da) +SFX_Go_Inside_3_Ch1: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index 2e8a8b31..2038d299 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_1_Ch1: ; 8452 (2:4452) +SFX_Go_Outside_1_Ch1: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index 2dc4242d..d45b8410 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b) +SFX_Go_Outside_3_Ch1: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 5937f3a2..3a292b82 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9) +SFX_Heal_Ailment_1_Ch1: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index 4b39895a..25e1bbe0 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd) +SFX_Heal_Ailment_2_Ch1: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index b2805f3d..2719358f 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2) +SFX_Heal_Ailment_3_Ch1: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index eb8063f7..a23db490 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7) +SFX_Heal_HP_1_Ch1: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index 890a2151..f21f6712 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee) +SFX_Heal_HP_2_Ch1: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index da80d48f..96ff391b 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490) +SFX_Heal_HP_3_Ch1: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 4babf6b0..ecb7c09c 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580) +SFX_Healing_Machine_1_Ch1: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index c72f7905..ec73e139 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d) +SFX_Healing_Machine_3_Ch1: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index e68e5834..b1af527b 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,4 +1,4 @@ -SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1) +SFX_Horn_Drill_Ch1: unknownnoise0x20 3, 146, 49 unknownnoise0x20 3, 178, 50 unknownnoise0x20 3, 194, 51 diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 65e475f8..69d6ff9b 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de) +SFX_Intro_Crash_Ch1: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 70d0f8b1..3d6de9d6 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be) +SFX_Intro_Hip_Ch1: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 64, 7 diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 223c7f25..8e077c67 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9) +SFX_Intro_Hop_Ch1: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 128, 6 diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index ad00f56f..cb7570de 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,4 +1,4 @@ -SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5) +SFX_Intro_Lunge_Ch1: unknownnoise0x20 6, 32, 16 unknownnoise0x20 6, 47, 64 unknownnoise0x20 6, 79, 65 diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index d6ee1430..0088228f 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,4 +1,4 @@ -SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4) +SFX_Intro_Raise_Ch1: unknownnoise0x20 2, 111, 33 unknownnoise0x20 2, 175, 49 unknownnoise0x20 15, 242, 65 diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 903b7252..5609bfc0 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,4 +1,4 @@ -SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5) +SFX_Intro_Whoosh_Ch1: unknownnoise0x20 4, 44, 32 unknownnoise0x20 3, 160, 32 unknownnoise0x20 3, 176, 33 diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index dfd7c819..72aa087e 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,4 +1,4 @@ -SFX_Ledge_1_Ch1: ; 85d6 (2:45d6) +SFX_Ledge_1_Ch1: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 2bf172e7..a554282e 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,4 +1,4 @@ -SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3) +SFX_Ledge_3_Ch1: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index 03e077ec..f0890eab 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,4 +1,4 @@ -SFX_Level_Up_Ch1: ; 2397d (8:797d) +SFX_Level_Up_Ch1: executemusic tempo 256 volume 7, 7 @@ -20,7 +20,7 @@ SFX_Level_Up_Ch1: ; 2397d (8:797d) endchannel -SFX_Level_Up_Ch2: ; 23998 (8:7998) +SFX_Level_Up_Ch2: executemusic vibrato 4, 2, 2 duty 2 @@ -40,7 +40,7 @@ SFX_Level_Up_Ch2: ; 23998 (8:7998) endchannel -SFX_Level_Up_Ch3: ; 239b0 (8:79b0) +SFX_Level_Up_Ch3: executemusic notetype 6, 1, 0 octave 5 diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index 5d10ecc1..b29a5b87 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347) +SFX_Muted_Snare1_1_Ch1: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index ea3cfc8c..a7f5467f 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347) +SFX_Muted_Snare1_2_Ch1: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 27caa37b..136018ef 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347) +SFX_Muted_Snare1_3_Ch1: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index 7ab6252b..9ad52c27 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355) +SFX_Muted_Snare2_1_Ch1: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index a9359226..20670ec8 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355) +SFX_Muted_Snare2_2_Ch1: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index 7ac9705d..007d462d 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355) +SFX_Muted_Snare2_3_Ch1: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 1cd27319..8db6b874 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359) +SFX_Muted_Snare3_1_Ch1: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 1606b6d5..013ea9ab 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359) +SFX_Muted_Snare3_2_Ch1: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index c0fe7efb..038a66db 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359) +SFX_Muted_Snare3_3_Ch1: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index bcac6440..99429995 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d) +SFX_Muted_Snare4_1_Ch1: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index 6910c20d..11ee3218 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d) +SFX_Muted_Snare4_2_Ch1: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 52f14f21..86223813 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d) +SFX_Muted_Snare4_3_Ch1: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 959f33e3..8a4c521e 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,4 +1,4 @@ -SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe) +SFX_Not_Very_Effective_Ch1: unknownnoise0x20 4, 143, 85 unknownnoise0x20 2, 244, 68 unknownnoise0x20 8, 244, 34 diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index e4632281..c474e9b3 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch1: ; 204aa (8:44aa) +SFX_Peck_Ch1: unknownnoise0x20 2, 161, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 4760696d..bfd619fd 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,4 +1,4 @@ -SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6) +SFX_Poisoned_1_Ch1: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index b6d69dc6..b972ca92 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,4 +1,4 @@ -SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f) +SFX_Poisoned_3_Ch1: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index 21503d16..eccf0ee5 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8) +SFX_Pokedex_Rating_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8) endchannel -SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1) +SFX_Pokedex_Rating_1_Ch2: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1) endchannel -SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7) +SFX_Pokedex_Rating_1_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index a9ea1c75..ec82888e 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda) +SFX_Pokedex_Rating_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda) endchannel -SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3) +SFX_Pokedex_Rating_3_Ch2: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3) endchannel -SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09) +SFX_Pokedex_Rating_3_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index 4abf1713..cf61a6ee 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,4 +1,4 @@ -SFX_Pokeflute_Ch1: ; 83ca (2:43ca) +SFX_Pokeflute_Ch1: vibrato 16, 1, 4 notetype 12, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute_ch1_ch2.asm b/audio/sfx/pokeflute_ch1_ch2.asm index 4ccf89d8..84631bca 100755 --- a/audio/sfx/pokeflute_ch1_ch2.asm +++ b/audio/sfx/pokeflute_ch1_ch2.asm @@ -1,8 +1,8 @@ -SFX_08_PokeFlute_Ch1: ; 22322 (8:6322) +SFX_08_PokeFlute_Ch1: tempo 256 -SFX_08_PokeFlute_Ch2: ; 22325 (8:6325) +SFX_08_PokeFlute_Ch2: executemusic notetype 8, 0, 0 rest 5 diff --git a/audio/sfx/pokeflute_ch3.asm b/audio/sfx/pokeflute_ch3.asm index 0652e673..3c883462 100755 --- a/audio/sfx/pokeflute_ch3.asm +++ b/audio/sfx/pokeflute_ch3.asm @@ -1,4 +1,4 @@ -SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) +SFX_08_PokeFlute_Ch3: executemusic vibrato 16, 1, 4 notetype 8, 1, 0 diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index 102d7d6d..f70f6725 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch1: ; 204c4 (8:44c4) +SFX_Pound_Ch1: unknownnoise0x20 2, 161, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index 5925b788..f68a6384 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_1_Ch1: ; 8462 (2:4462) +SFX_Press_AB_1_Ch1: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index e15dadc4..83b5ccd6 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3) +SFX_Press_AB_2_Ch1: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 8af4a335..167c0fb1 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b) +SFX_Press_AB_3_Ch1: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 65fcc229..893d4334 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,4 +1,4 @@ -SFX_Psybeam_Ch1: ; 20759 (8:4759) +SFX_Psybeam_Ch1: dutycycle 161 unknownsfx0x20 10, 241, 64, 6 unknownsfx0x20 10, 243, 128, 6 @@ -8,7 +8,7 @@ SFX_Psybeam_Ch1: ; 20759 (8:4759) endchannel -SFX_Psybeam_Ch2: ; 20770 (8:4770) +SFX_Psybeam_Ch2: dutycycle 179 unknownsfx0x20 10, 243, 113, 5 unknownsfx0x20 7, 227, 49, 5 @@ -18,7 +18,7 @@ SFX_Psybeam_Ch2: ; 20770 (8:4770) endchannel -SFX_Psybeam_Ch3: ; 20787 (8:4787) +SFX_Psybeam_Ch3: unknownnoise0x20 2, 209, 74 unknownnoise0x20 2, 210, 42 loopchannel 21, SFX_Psybeam_Ch3 diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index e734b7ac..abaa8345 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,4 +1,4 @@ -SFX_Psychic_M_Ch1: ; 207fa (8:47fa) +SFX_Psychic_M_Ch1: duty 2 unknownsfx0x10 247 unknownsfx0x20 8, 196, 189, 7 @@ -11,7 +11,7 @@ SFX_Psychic_M_Ch1: ; 207fa (8:47fa) endchannel -SFX_Psychic_M_Ch2: ; 20819 (8:4819) +SFX_Psychic_M_Ch2: duty 2 unknownsfx0x20 8, 196, 112, 7 unknownsfx0x20 8, 196, 97, 7 @@ -22,7 +22,7 @@ SFX_Psychic_M_Ch2: ; 20819 (8:4819) endchannel -SFX_Psychic_M_Ch3: ; 20834 (8:4834) +SFX_Psychic_M_Ch3: unknownnoise0x20 15, 63, 20 unknownnoise0x20 15, 207, 19 unknownnoise0x20 15, 207, 18 diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index fc0cecb5..767035ea 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,11 +1,11 @@ -SFX_Purchase_1_Ch1: ; 842d (2:442d) +SFX_Purchase_1_Ch1: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_1_Ch2: ; 8438 (2:4438) +SFX_Purchase_1_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 5d649958..65a22527 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,11 +1,11 @@ -SFX_Purchase_3_Ch1: ; 7c416 (1f:4416) +SFX_Purchase_3_Ch1: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_3_Ch2: ; 7c421 (1f:4421) +SFX_Purchase_3_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index 31096861..cf43bbcf 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654) +SFX_Push_Boulder_1_Ch1: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index ca7d2cd1..9f536964 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631) +SFX_Push_Boulder_3_Ch1: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index 653b0f6b..656d3d01 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,4 +1,4 @@ -SFX_Run_Ch1: ; 2045d (8:445d) +SFX_Run_Ch1: unknownnoise0x20 2, 97, 35 unknownnoise0x20 2, 161, 51 unknownnoise0x20 2, 193, 51 diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index fb8c4d1f..d385feb3 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,4 +1,4 @@ -SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8) +SFX_Safari_Zone_PA_Ch1: duty 2 unknownsfx0x20 15, 243, 48, 7 unknownsfx0x20 8, 101, 48, 7 diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 2e6c1f2b..13cb46e5 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,4 +1,4 @@ -SFX_Save_1_Ch1: ; 8475 (2:4475) +SFX_Save_1_Ch1: duty 2 unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 2, 228, 0, 6 @@ -10,7 +10,7 @@ SFX_Save_1_Ch1: ; 8475 (2:4475) endchannel -SFX_Save_1_Ch2: ; 8494 (2:4494) +SFX_Save_1_Ch2: duty 2 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 2, 212, 1, 7 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index 47142bb4..ad049ec6 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,4 +1,4 @@ -SFX_Save_3_Ch1: ; 7c45e (1f:445e) +SFX_Save_3_Ch1: duty 2 IF DEF(_RED) unknownsfx0x20 4, 244, 0, 7 @@ -16,7 +16,7 @@ ENDC endchannel -SFX_Save_3_Ch2: ; 7c475 (1f:4475) +SFX_Save_3_Ch2: duty 2 IF DEF(_RED) unknownsfx0x20 4, 8, 0, 0 diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index 2cb831c8..f8b8e285 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,4 +1,4 @@ -SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d) +SFX_Shooting_Star_Ch1: dutycycle 228 unknownsfx0x10 47 unknownsfx0x20 4, 64, 224, 7 diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index 61ca1933..d69d60de 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,4 +1,4 @@ -SFX_Shrink_1_Ch1: ; 854e (2:454e) +SFX_Shrink_1_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index 59fe1556..e5c4b7af 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,4 +1,4 @@ -SFX_Shrink_3_Ch1: ; 7c52b (1f:452b) +SFX_Shrink_3_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index 66e4fe95..ad789af2 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,4 +1,4 @@ -SFX_Silph_Scope_Ch1: ; 20412 (8:4412) +SFX_Silph_Scope_Ch1: duty 0 unknownsfx0x20 0, 210, 0, 7 unknownsfx0x20 0, 210, 64, 7 diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index d122517d..d29529e9 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,4 +1,4 @@ -SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f) +SFX_Slots_New_Spin_Ch1: duty 3 unknownsfx0x20 5, 225, 0, 7 unknownsfx0x20 2, 225, 128, 7 @@ -6,7 +6,7 @@ SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f) endchannel -SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e) +SFX_Slots_New_Spin_Ch2: duty 2 unknownsfx0x20 4, 193, 193, 6 unknownsfx0x20 2, 193, 65, 7 diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index 2400c0df..d7833f55 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,4 +1,4 @@ -SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704) +SFX_Slots_Reward_Ch1: duty 2 unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 8, 129, 224, 7 diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index e67af4c4..00641a5e 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,4 +1,4 @@ -SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5) +SFX_Slots_Stop_Wheel_Ch1: duty 2 unknownsfx0x20 1, 242, 160, 6 unknownsfx0x20 1, 242, 224, 6 diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index 3aa0f74e..9f7b4138 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ -SFX_Snare1_1_Ch1: ; 82fd (2:42fd) +SFX_Snare1_1_Ch1: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 7d0c3413..55fdf84a 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ -SFX_Snare1_2_Ch1: ; 202fd (8:42fd) +SFX_Snare1_2_Ch1: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index 8d92bff6..cab603c1 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ -SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd) +SFX_Snare1_3_Ch1: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index 7636a4f3..e40facb5 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Snare2_1_Ch1: ; 8301 (2:4301) +SFX_Snare2_1_Ch1: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index 4c34e91a..82deb096 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Snare2_2_Ch1: ; 20301 (8:4301) +SFX_Snare2_2_Ch1: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index eb816f54..fb5e1672 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Snare2_3_Ch1: ; 7c301 (1f:4301) +SFX_Snare2_3_Ch1: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index b7e319b2..c2b20add 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Snare3_1_Ch1: ; 8305 (2:4305) +SFX_Snare3_1_Ch1: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index ce889e55..16f87fc5 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Snare3_2_Ch1: ; 20305 (8:4305) +SFX_Snare3_2_Ch1: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index c94f436f..6b9a006f 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Snare3_3_Ch1: ; 7c305 (1f:4305) +SFX_Snare3_3_Ch1: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 20c62731..2796410c 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Snare4_1_Ch1: ; 8309 (2:4309) +SFX_Snare4_1_Ch1: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index da38dd62..920321ab 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Snare4_2_Ch1: ; 20309 (8:4309) +SFX_Snare4_2_Ch1: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index 4496260b..a47c332c 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Snare4_3_Ch1: ; 7c309 (1f:4309) +SFX_Snare4_3_Ch1: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index e0ae8b4c..dd4eab3a 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,4 +1,4 @@ -SFX_Snare5_1_Ch1: ; 830d (2:430d) +SFX_Snare5_1_Ch1: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index 649463cc..fad74021 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,4 +1,4 @@ -SFX_Snare5_2_Ch1: ; 2030d (8:430d) +SFX_Snare5_2_Ch1: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index 33a169b9..d0ca1d91 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,4 +1,4 @@ -SFX_Snare5_3_Ch1: ; 7c30d (1f:430d) +SFX_Snare5_3_Ch1: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 4779226f..74bf01c7 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ -SFX_Snare6_1_Ch1: ; 832b (2:432b) +SFX_Snare6_1_Ch1: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 36359d02..0a96680e 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ -SFX_Snare6_2_Ch1: ; 2032b (8:432b) +SFX_Snare6_2_Ch1: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index d4807ff6..f3130931 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ -SFX_Snare6_3_Ch1: ; 7c32b (1f:432b) +SFX_Snare6_3_Ch1: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index c53642ed..ef8f80ab 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ -SFX_Snare7_1_Ch1: ; 832f (2:432f) +SFX_Snare7_1_Ch1: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index 066aaa53..5e266b12 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ -SFX_Snare7_2_Ch1: ; 2032f (8:432f) +SFX_Snare7_2_Ch1: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index 1b058a9b..26db3703 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ -SFX_Snare7_3_Ch1: ; 7c32f (1f:432f) +SFX_Snare7_3_Ch1: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 6269c7dc..5f624177 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ -SFX_Snare8_1_Ch1: ; 8333 (2:4333) +SFX_Snare8_1_Ch1: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index 4c5bb18e..cf5d5654 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ -SFX_Snare8_2_Ch1: ; 20333 (8:4333) +SFX_Snare8_2_Ch1: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index d1f0edc0..7da0e415 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ -SFX_Snare8_3_Ch1: ; 7c333 (1f:4333) +SFX_Snare8_3_Ch1: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index 44b2e8c7..c511cdaf 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ -SFX_Snare9_1_Ch1: ; 8337 (2:4337) +SFX_Snare9_1_Ch1: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index 1d20de2d..db9aecf9 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ -SFX_Snare9_2_Ch1: ; 20337 (8:4337) +SFX_Snare9_2_Ch1: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index 849f4404..18df2e46 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ -SFX_Snare9_3_Ch1: ; 7c337 (1f:4337) +SFX_Snare9_3_Ch1: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 3989c148..66c95262 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d) +SFX_SS_Anne_Horn_1_Ch1: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d) endchannel -SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c) +SFX_SS_Anne_Horn_1_Ch2: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index c671b6cb..070f111c 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a) +SFX_SS_Anne_Horn_3_Ch1: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a) endchannel -SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669) +SFX_SS_Anne_Horn_3_Ch2: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 350b08ce..f509326c 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3) +SFX_Start_Menu_1_Ch1: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index aabd41ce..92bb7558 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6) +SFX_Start_Menu_2_Ch1: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 566f11f4..74c82cf3 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3) +SFX_Start_Menu_3_Ch1: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 6759ef6a..70d7014a 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch1: ; 20574 (8:4574) +SFX_Super_Effective_Ch1: unknownnoise0x20 4, 241, 52 unknownnoise0x20 15, 242, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index c96d8522..782dd3fb 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,10 +1,10 @@ -SFX_Swap_1_Ch1: ; 83f8 (2:43f8) +SFX_Swap_1_Ch1: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_1_Ch2: ; 83ff (2:43ff) +SFX_Swap_1_Ch2: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 95aa3f19..4fc1db1d 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,10 +1,10 @@ -SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1) +SFX_Swap_3_Ch1: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8) +SFX_Swap_3_Ch2: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index 040e95aa..ac9fb680 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,4 +1,4 @@ -SFX_Switch_1_Ch1: ; 8569 (2:4569) +SFX_Switch_1_Ch1: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index cbe6c8b2..81b68d26 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,4 +1,4 @@ -SFX_Switch_3_Ch1: ; 7c546 (1f:4546) +SFX_Switch_3_Ch1: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index f9fc5ee2..0522ee16 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0) +SFX_Teleport_Enter1_1_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index 24220173..6518e416 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d) +SFX_Teleport_Enter1_3_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index c3c593b2..338c1c30 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1) +SFX_Teleport_Enter2_1_Ch1: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index 628bb9fa..f6cd103c 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be) +SFX_Teleport_Enter2_3_Ch1: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index 46ba29cf..f916d539 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595) +SFX_Teleport_Exit1_1_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index 8d203212..67739bd1 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572) +SFX_Teleport_Exit1_3_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 37159083..1e1de5a5 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb) +SFX_Teleport_Exit2_1_Ch1: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index c7ad054b..928e486e 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8) +SFX_Teleport_Exit2_3_Ch1: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index a8099ae1..e6eff9ac 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,4 +1,4 @@ -SFX_Tink_1_Ch1: ; 840a (2:440a) +SFX_Tink_1_Ch1: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index cca37381..fa06cf19 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,4 +1,4 @@ -SFX_Tink_2_Ch1: ; 203dd (8:43dd) +SFX_Tink_2_Ch1: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index 7299b7ae..d786d289 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,4 +1,4 @@ -SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3) +SFX_Tink_3_Ch1: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index ce2bbc0a..87993851 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee) +SFX_Trade_Machine_1_Ch1: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index f7515ffb..6b70d5da 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7) +SFX_Trade_Machine_3_Ch1: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index fded5b94..94b61fe1 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_1_Ch1: ; 8320 (2:4320) +SFX_Triangle1_1_Ch1: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 4f4474ee..1c9c1d29 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_2_Ch1: ; 20320 (8:4320) +SFX_Triangle1_2_Ch1: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index d1ad9390..b900da7c 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320) +SFX_Triangle1_3_Ch1: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index f9c4bc6a..0f648237 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_1_Ch1: ; 8324 (2:4324) +SFX_Triangle2_1_Ch1: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index feddf1af..cbc2a642 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_2_Ch1: ; 20324 (8:4324) +SFX_Triangle2_2_Ch1: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index a4acff1b..44fc95dd 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324) +SFX_Triangle2_3_Ch1: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index e4c3c919..f5622bd7 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_1_Ch1: ; 834e (2:434e) +SFX_Triangle3_1_Ch1: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 7a642878..8b0b76e5 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_2_Ch1: ; 2034e (8:434e) +SFX_Triangle3_2_Ch1: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index 73ad42ce..d40779fb 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e) +SFX_Triangle3_3_Ch1: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index 7b4e999d..ca29a4cc 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528) +SFX_Turn_Off_PC_1_Ch1: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index 057ab9a4..2ae0787b 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505) +SFX_Turn_Off_PC_3_Ch1: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index b537791c..22433707 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd) +SFX_Turn_On_PC_1_Ch1: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index df654cfa..d97dc1c7 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6) +SFX_Turn_On_PC_3_Ch1: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 1eca4432..7e0350d4 100755 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused2_Ch1: ; 2232f (8:632f) +SFX_08_unused2_Ch1: executemusic tempo 256 volume 7, 7 @@ -17,7 +17,7 @@ SFX_08_unused2_Ch1: ; 2232f (8:632f) endchannel -SFX_08_unused2_Ch2: ; 22347 (8:6347) +SFX_08_unused2_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -33,7 +33,7 @@ SFX_08_unused2_Ch2: ; 22347 (8:6347) endchannel -SFX_08_unused2_Ch3: ; 22359 (8:6359) +SFX_08_unused2_Ch3: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index bd9bdfb3..d0bbfd59 100755 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,4 +1,4 @@ -SFX_02_unused_Ch1: ; 86e3 (2:46e3) +SFX_02_unused_Ch1: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_02_unused_Ch1: ; 86e3 (2:46e3) endchannel -SFX_02_unused_Ch2: ; 86fe (2:46fe) +SFX_02_unused_Ch2: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_02_unused_Ch2: ; 86fe (2:46fe) endchannel -SFX_02_unused_Ch3: ; 8719 (2:4719) +SFX_02_unused_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index 25e4840c..fd491b71 100755 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused_Ch1: ; 2098b (8:498b) +SFX_08_unused_Ch1: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_08_unused_Ch1: ; 2098b (8:498b) endchannel -SFX_08_unused_Ch2: ; 209a6 (8:49a6) +SFX_08_unused_Ch2: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_08_unused_Ch2: ; 209a6 (8:49a6) endchannel -SFX_08_unused_Ch3: ; 209c1 (8:49c1) +SFX_08_unused_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index dfb16ee1..b00e55f5 100755 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,4 +1,4 @@ -SFX_1f_unused_Ch1: ; 7c758 (1f:4758) +SFX_1f_unused_Ch1: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_1f_unused_Ch1: ; 7c758 (1f:4758) endchannel -SFX_1f_unused_Ch2: ; 7c773 (1f:4773) +SFX_1f_unused_Ch2: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_1f_unused_Ch2: ; 7c773 (1f:4773) endchannel -SFX_1f_unused_Ch3: ; 7c78e (1f:478e) +SFX_1f_unused_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index c1e610b6..a8445131 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,4 +1,4 @@ -SFX_Vine_Whip_Ch1: ; 20533 (8:4533) +SFX_Vine_Whip_Ch1: unknownnoise0x20 1, 194, 51 unknownnoise0x20 2, 242, 33 unknownnoise0x20 1, 226, 51 diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index bb7a8d6e..59827ceb 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab) +SFX_Withdraw_Deposit_1_Ch1: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 99e47fee..0add48e1 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688) +SFX_Withdraw_Deposit_3_Ch1: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 diff --git a/data/animations.asm b/data/animations.asm index cf6dc150..8c388afd 100755 --- a/data/animations.asm +++ b/data/animations.asm @@ -1,4 +1,4 @@ -AttackAnimationPointers: ; 7a07d (1e:607d) +AttackAnimationPointers: dw PoundAnim dw KarateChopAnim dw DoubleSlapAnim @@ -209,156 +209,156 @@ AttackAnimationPointers: ; 7a07d (1e:607d) ; if first byte >= $D8 ; db special_effect_id, sound_id ; $FF terminated -ZigZagScreenAnim: ; 7a213 (1e:6213) +ZigZagScreenAnim: db SE_WAVY_SCREEN, $FF db $FF -PoundAnim: ; 7a216 (1e:6216) -StruggleAnim: ; 7a216 (1e:6216) +PoundAnim: +StruggleAnim: db $08,$00,$01 db $FF -KarateChopAnim: ; 7a21a (1e:621a) +KarateChopAnim: db $08,$01,$03 db $FF -DoubleSlapAnim: ; 7a21e (1e:621e) +DoubleSlapAnim: db $05,$02,$01 db $05,$02,$01 db $FF -CometPunchAnim: ; 7a225 (1e:6225) +CometPunchAnim: db $04,$03,$02 db $04,$03,$02 db $FF -MegaPunchAnim: ; 7a22c (1e:622c) +MegaPunchAnim: db $46,$04,$04 db $FF -PayDayAnim: ; 7a230 (1e:6230) +PayDayAnim: db $08,$00,$01 db $04,$05,$52 db $FF -FirePunchAnim: ; 7a237 (1e:6237) +FirePunchAnim: db $06,$06,$02 db $46,$FF,$11 db $FF -IcePunchAnim: ; 7a23e (1e:623e) +IcePunchAnim: db $06,$07,$02 db $10,$FF,$2F db $FF -ThunderPunchAnim: ; 7a245 (1e:6245) +ThunderPunchAnim: db $06,$08,$02 db SE_DARK_SCREEN_PALETTE, $FF db $46,$FF,$2B db SE_RESET_SCREEN_PALETTE, $FF db $FF -ScratchAnim: ; 7a250 (1e:6250) +ScratchAnim: db $06,$09,$0F db $FF -VicegripAnim: ; 7a254 (1e:6254) +VicegripAnim: db $08,$0A,$2A db $FF -GuillotineAnim: ; 7a258 (1e:6258) +GuillotineAnim: db $06,$0B,$2A db $FF -RazorWindAnim: ; 7a25c (1e:625c) +RazorWindAnim: db $04,$0C,$16 db $FF -SwordsDanceAnim: ; 7a260 (1e:6260) +SwordsDanceAnim: db $46,$0D,$18 db $46,$0D,$18 db $46,$0D,$18 db $FF -CutAnim: ; 7a26a (1e:626a) +CutAnim: db SE_DARK_SCREEN_FLASH, $0E db $04,$FF,$16 db $FF -GustAnim: ; 7a270 (1e:6270) +GustAnim: db $46,$0F,$10 db $06,$FF,$02 db $FF -WingAttackAnim: ; 7a277 (1e:6277) +WingAttackAnim: db $46,$10,$04 db $FF -WhirlwindAnim: ; 7a27b (1e:627b) +WhirlwindAnim: db $46,$11,$10 db SE_SLIDE_ENEMY_MON_OFF, $FF db $FF -FlyAnim: ; 7a281 (1e:6281) +FlyAnim: db $46,$12,$04 db SE_SHOW_MON_PIC, $FF db $FF -BindAnim: ; 7a287 (1e:6287) +BindAnim: db $04,$13,$23 db $04,$13,$23 db $FF -SlamAnim: ; 7a28e (1e:628e) +SlamAnim: db $06,$14,$02 db $FF -VineWhipAnim: ; 7a292 (1e:6292) +VineWhipAnim: db $01,$15,$16 db $08,$FF,$01 db $FF -StompAnim: ; 7a299 (1e:6299) +StompAnim: db $48,$16,$05 db $FF -DoubleKickAnim: ; 7a29d (1e:629d) +DoubleKickAnim: db $08,$17,$01 db $08,$17,$01 db $FF -MegaKickAnim: ; 7a2a4 (1e:62a4) +MegaKickAnim: db $46,$18,$04 db $FF -JumpKickAnim: ; 7a2a8 (1e:62a8) +JumpKickAnim: db $46,$19,$04 db $FF -RollingKickAnim: ; 7a2ac (1e:62ac) +RollingKickAnim: db SE_DARK_SCREEN_FLASH, $1A db $46,$FF,$04 db $FF -SandAttackAnim: ; 7a2b2 (1e:62b2) +SandAttackAnim: db $46,$1B,$28 db $FF -HeatButtAnim: ; 7a2b6 (1e:62b6) +HeatButtAnim: db $46,$1C,$05 db $FF -HornAttackAnim: ; 7a2ba (1e:62ba) +HornAttackAnim: db $06,$1D,$45 db $46,$FF,$05 db $FF -FuryAttackAnim: ; 7a2c1 (1e:62c1) +FuryAttackAnim: db $02,$1E,$46 db $02,$FF,$46 db $FF -HornDrillAnim: ; 7a2c8 (1e:62c8) +HornDrillAnim: db $42,$1F,$05 db $42,$FF,$05 db $42,$FF,$05 @@ -366,35 +366,35 @@ HornDrillAnim: ; 7a2c8 (1e:62c8) db $42,$FF,$05 db $FF -TackleAnim: ; 7a2d8 (1e:62d8) +TackleAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_RESET_MON_POSITION, $FF db $FF -BodySlamAnim: ; 7a2dd (1e:62dd) +BodySlamAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_DARK_SCREEN_FLASH, $FF db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_MON_POSITION, $FF db $FF -WrapAnim: ; 7a2e6 (1e:62e6) +WrapAnim: db $04,$22,$23 db $04,$22,$23 db $04,$22,$23 db $FF -TakeDownAnim: ; 7a2f0 (1e:62f0) +TakeDownAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_DARK_SCREEN_FLASH, $23 db SE_RESET_MON_POSITION, $FF db $FF -ThrashAnim: ; 7a2f7 (1e:62f7) +ThrashAnim: db $46,$24,$04 db $FF -DoubleEdgeAnim: ; 7a2fb (1e:62fb) +DoubleEdgeAnim: db SE_LIGHT_SCREEN_PALETTE, $48 db $06,$FF,$2D db SE_RESET_SCREEN_PALETTE, $FF @@ -403,7 +403,7 @@ DoubleEdgeAnim: ; 7a2fb (1e:62fb) db SE_RESET_MON_POSITION, $FF db $FF -TailWhipAnim: ; 7a309 (1e:6309) +TailWhipAnim: db SE_MOVE_MON_HORIZONTALLY, $84 db SE_DELAY_ANIMATION_10, $FF db SE_RESET_MON_POSITION, $84 @@ -413,125 +413,125 @@ TailWhipAnim: ; 7a309 (1e:6309) db SE_RESET_MON_POSITION, $84 db $FF -PoisonStingAnim: ; 7a318 (1e:6318) +PoisonStingAnim: db $06,$27,$00 db $FF -TwineedleAnim: ; 7a31c (1e:631c) +TwineedleAnim: db $05,$28,$01 db $05,$28,$01 db $FF -PinMissileAnim: ; 7a323 (1e:6323) +PinMissileAnim: db $03,$29,$01 db $FF -LeerAnim: ; 7a327 (1e:6327) +LeerAnim: db SE_DARK_SCREEN_PALETTE, $48 db SE_DARK_SCREEN_FLASH, $2A db SE_DARK_SCREEN_FLASH, $2A db SE_RESET_SCREEN_PALETTE, $FF db $FF -BiteAnim: ; 7a330 (1e:6330) +BiteAnim: db $08,$2B,$02 db $FF -GrowlAnim: ; 7a334 (1e:6334) +GrowlAnim: db $46,$2C,$12 db $FF -RoarAnim: ; 7a338 (1e:6338) +RoarAnim: db $46,$2D,$15 db $46,$2D,$15 db $46,$2D,$15 db $FF -SingAnim: ; 7a342 (1e:6342) +SingAnim: db $46,$2E,$12 db $50,$FF,$40 db $50,$FF,$40 db $FF -SupersonicAnim: ; 7a34c (1e:634c) +SupersonicAnim: db $06,$2F,$31 db $FF -SonicBoomAnim: ; 7a350 (1e:6350) +SonicBoomAnim: db $46,$2D,$15 db $46,$2D,$15 db $46,$0F,$10 db $46,$FF,$05 db $FF -DisableAnim: ; 7a35d (1e:635d) +DisableAnim: db SE_DARK_SCREEN_PALETTE, $48 db SE_DARK_SCREEN_FLASH, $2A db SE_DARK_SCREEN_FLASH, $2A db SE_RESET_SCREEN_PALETTE, $FF db $FF -AcidAnim: ; 7a366 (1e:6366) +AcidAnim: db $46,$32,$13 db $46,$32,$14 db $FF -EmberAnim: ; 7a36d (1e:636d) +EmberAnim: db $46,$33,$11 db $FF -FlamethrowerAnim: ; 7a371 (1e:6371) +FlamethrowerAnim: db $46,$34,$1F db $46,$34,$0C db $46,$34,$0D db $FF -MistAnim: ; 7a37b (1e:637b) +MistAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db SE_WATER_DROPLETS_EVERYWHERE, $38 db SE_RESET_SCREEN_PALETTE, $FF db $FF -WaterGunAnim: ; 7a382 (1e:6382) +WaterGunAnim: db $06,$36,$2C db $FF -HydroPumpAnim: ; 7a386 (1e:6386) +HydroPumpAnim: db $06,$37,$1A db $06,$37,$1A db $FF -SurfAnim: ; 7a38d (1e:638d) +SurfAnim: db SE_WATER_DROPLETS_EVERYWHERE, $38 db $06,$37,$1A db $FF -IceBeamAnim: ; 7a393 (1e:6393) +IceBeamAnim: db $03,$39,$2E db $10,$FF,$2F db $FF -BlizzardAnim: ; 7a39a (1e:639a) +BlizzardAnim: db $04,$3A,$38 db $04,$37,$38 db $FF -PsyBeamAnim: ; 7a3a1 (1e:63a1) +PsyBeamAnim: db $03,$3B,$2E db SE_FLASH_SCREEN_LONG, $FF db $FF -BubbleBeamAnim: ; 7a3a7 (1e:63a7) +BubbleBeamAnim: db $12,$3C,$35 db $FF -AuroraBeamAnim: ; 7a3ab (1e:63ab) +AuroraBeamAnim: db $03,$3D,$2E db SE_DELAY_ANIMATION_10, $FF db SE_DELAY_ANIMATION_10, $FF db $FF -HyperBeamAnim: ; 7a3b3 (1e:63b3) +HyperBeamAnim: db SE_DARK_SCREEN_PALETTE, $48 db SE_SPIRAL_BALLS_INWARD, $FF db $02,$3E,$2E @@ -541,33 +541,33 @@ HyperBeamAnim: ; 7a3b3 (1e:63b3) db SE_RESET_SCREEN_PALETTE, $FF db $FF -PeckAnim: ; 7a3c4 (1e:63c4) +PeckAnim: db $08,$3F,$01 db $FF -DrillPeckAnim: ; 7a3c8 (1e:63c8) +DrillPeckAnim: db $46,$40,$04 db $FF -SubmissionAnim: ; 7a3cc (1e:63cc) +SubmissionAnim: db SE_SLIDE_MON_OFF, $41 db $06,$FF,$01 db SE_SHOW_MON_PIC, $FF db $FF -LowKickAnim: ; 7a3d4 (1e:63d4) +LowKickAnim: db SE_SLIDE_MON_OFF, $42 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF -CounterAnim: ; 7a3dc (1e:63dc) +CounterAnim: db SE_SLIDE_MON_OFF, $43 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF -SeismicTossAnim: ; 7a3e4 (1e:63e4) +SeismicTossAnim: db SE_BLINK_ENEMY_MON, $FF db $41,$8B,$4E db SE_HIDE_ENEMY_MON_PIC, $FF @@ -581,20 +581,20 @@ SeismicTossAnim: ; 7a3e4 (1e:63e4) db SE_SHAKE_SCREEN, $FF db $FF -StrengthAnim: ; 7a3fe (1e:63fe) +StrengthAnim: db SE_MOVE_MON_HORIZONTALLY, $48 db SE_RESET_MON_POSITION, $FF db $46,$06,$04 db $FF -AbsorbAnim: ; 7a406 (1e:6406) +AbsorbAnim: db SE_LIGHT_SCREEN_PALETTE, $46 db $06,$FF,$21 db $06,$FF,$22 db SE_RESET_SCREEN_PALETTE, $FF db $FF -MegaDrainAnim: ; 7a411 (1e:6411) +MegaDrainAnim: db SE_LIGHT_SCREEN_PALETTE, $47 db SE_DARK_SCREEN_FLASH, $FF db $06,$FF,$21 @@ -603,79 +603,79 @@ MegaDrainAnim: ; 7a411 (1e:6411) db SE_RESET_SCREEN_PALETTE, $FF db $FF -LeechSeedAnim: ; 7a420 (1e:6420) +LeechSeedAnim: db $46,$48,$1B db $55,$4D,$1C db $FF -GrowthAnim: ; 7a427 (1e:6427) +GrowthAnim: db SE_LIGHT_SCREEN_PALETTE, $49 db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -RazorLeafAnim: ; 7a42e (1e:642e) +RazorLeafAnim: db SE_LEAVES_FALLING, $4A db $41,$80,$44 db $01,$0C,$16 db $FF -SolarBeamAnim: ; 7a437 (1e:6437) +SolarBeamAnim: db $06,$4B,$2E db $06,$FF,$01 db $FF -PoisonPowderAnim: ; 7a43e (1e:643e) +PoisonPowderAnim: db $06,$4C,$36 db $FF -StunSporeAnim: ; 7a442 (1e:6442) +StunSporeAnim: db $06,$4D,$36 db $FF -SleepPowderAnim: ; 7a446 (1e:6446) +SleepPowderAnim: db $06,$4E,$36 db $FF -PedalDanceAnim: ; 7a44a (1e:644a) +PedalDanceAnim: db SE_LIGHT_SCREEN_PALETTE, $4F db SE_PETALS_FALLING, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -StringShotAnim: ; 7a451 (1e:6451) +StringShotAnim: db $08,$50,$37 db $FF -DragonRageAnim: ; 7a455 (1e:6455) +DragonRageAnim: db $46,$51,$1F db $46,$FF,$0C db $46,$FF,$0D db $46,$FF,$0E db $FF -FireSpinAnim: ; 7a462 (1e:6462) +FireSpinAnim: db $46,$52,$0C db $46,$FF,$0D db $46,$FF,$0E db $FF -ThunderShockAnim: ; 7a46c (1e:646c) +ThunderShockAnim: db $42,$53,$29 db $FF -ThunderBoltAnim: ; 7a470 (1e:6470) +ThunderBoltAnim: db $41,$54,$29 db $41,$54,$29 db $FF -ThunderWaveAnim: ; 7a477 (1e:6477) +ThunderWaveAnim: db $42,$55,$29 db $02,$FF,$23 db $04,$FF,$23 db $FF -ThunderAnim: ; 7a481 (1e:6481) +ThunderAnim: db SE_DARK_SCREEN_PALETTE, $56 db SE_DARK_SCREEN_FLASH, $FF db $46,$FF,$2B @@ -684,87 +684,87 @@ ThunderAnim: ; 7a481 (1e:6481) db SE_RESET_SCREEN_PALETTE, $FF db $FF -RockThrowAnim: ; 7a490 (1e:6490) +RockThrowAnim: db $04,$57,$30 db $FF -EarthquakeAnim: ; 7a494 (1e:6494) +EarthquakeAnim: db SE_SHAKE_SCREEN, $58 db SE_SHAKE_SCREEN, $58 db $FF -FissureAnim: ; 7a499 (1e:6499) +FissureAnim: db SE_DARK_SCREEN_FLASH, $59 db SE_SHAKE_SCREEN, $FF db SE_DARK_SCREEN_FLASH, $59 db SE_SHAKE_SCREEN, $FF db $FF -DigAnim: ; 7a4a2 (1e:64a2) +DigAnim: db $46,$5A,$04 db SE_SLIDE_MON_UP, $FF db $FF -ToxicAnim: ; 7a4a8 (1e:64a8) +ToxicAnim: db SE_WATER_DROPLETS_EVERYWHERE, $38 db $46,$5B,$14 db $FF -ConfusionAnim: ; 7a4ae (1e:64ae) +ConfusionAnim: db SE_FLASH_SCREEN_LONG, $5C db $FF -PsychicAnim: ; 7a4b1 (1e:64b1) +PsychicAnim: db SE_FLASH_SCREEN_LONG, $5D db SE_WAVY_SCREEN, $FF db $FF -HypnosisAnim: ; 7a4b6 (1e:64b6) +HypnosisAnim: db SE_FLASH_SCREEN_LONG, $5E db $FF -MeditateAnim: ; 7a4b9 (1e:64b9) +MeditateAnim: db SE_LIGHT_SCREEN_PALETTE, $5F db $46,$FF,$43 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -AgilityAnim: ; 7a4c3 (1e:64c3) +AgilityAnim: db SE_LIGHT_SCREEN_PALETTE, $60 db SE_RESET_SCREEN_PALETTE, $FF db $FF -QuickAttackAnim: ; 7a4c8 (1e:64c8) +QuickAttackAnim: db SE_SLIDE_MON_OFF, $61 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF -RageAnim: ; 7a4d0 (1e:64d0) +RageAnim: db $06,$62,$01 db $FF -TeleportAnim: ; 7a4d4 (1e:64d4) +TeleportAnim: db SE_SQUISH_MON_PIC, $63 db SE_SHOOT_BALLS_UPWARD, $FF db $FF -NightShadeAnim: ; 7a4d9 (1e:64d9) +NightShadeAnim: db SE_FLASH_SCREEN_LONG, $5C db SE_WAVY_SCREEN, $FF db $FF -MimicAnim: ; 7a4de (1e:64de) +MimicAnim: db $46,$65,$21 db $46,$65,$22 db $FF -ScreechAnim: ; 7a4e5 (1e:64e5) +ScreechAnim: db $46,$66,$12 db $FF -DoubleTeamAnim: ; 7a4e9 (1e:64e9) +DoubleTeamAnim: db SE_DARK_SCREEN_PALETTE, $FF db SE_DELAY_ANIMATION_10, $FF db SE_DELAY_ANIMATION_10, $FF @@ -776,28 +776,28 @@ DoubleTeamAnim: ; 7a4e9 (1e:64e9) db $46,$6F,$33 db $FF -RecoverAnim: ; 7a4fd (1e:64fd) +RecoverAnim: db SE_BLINK_MON, $68 db SE_LIGHT_SCREEN_PALETTE, $FF db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -HardenAnim: ; 7a506 (1e:6506) +HardenAnim: db SE_LIGHT_SCREEN_PALETTE, $69 db $46,$FF,$43 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -MinimizeAnim: ; 7a510 (1e:6510) +MinimizeAnim: db SE_LIGHT_SCREEN_PALETTE, $6A db SE_SPIRAL_BALLS_INWARD, $FF db SE_MINIMIZE_MON, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -SmokeScreenAnim: ; 7a519 (1e:6519) +SmokeScreenAnim: db $46,$6B,$28 db $04,$FF,$0A db SE_DARKEN_MON_PALETTE, $FF @@ -815,13 +815,13 @@ SmokeScreenAnim: ; 7a519 (1e:6519) db SE_RESET_SCREEN_PALETTE, $FF db $FF -ConfuseRayAnim: ; 7a53a (1e:653a) +ConfuseRayAnim: db SE_DARK_SCREEN_PALETTE, $6C db $46,$FF,$3E db SE_RESET_SCREEN_PALETTE, $FF db $FF -WithdrawAnim: ; 7a542 (1e:6542) +WithdrawAnim: db SE_LIGHT_SCREEN_PALETTE, $6E db SE_SLIDE_MON_DOWN, $FF db $06,$FF,$51 @@ -829,47 +829,47 @@ WithdrawAnim: ; 7a542 (1e:6542) db SE_SHOW_MON_PIC, $FF db $FF -DefenseCurlAnim: ; 7a54e (1e:654e) +DefenseCurlAnim: db SE_LIGHT_SCREEN_PALETTE, $6E db $06,$FF,$43 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -BarrierAnim: ; 7a558 (1e:6558) +BarrierAnim: db $46,$6F,$33 db $46,$6F,$33 db $FF -LightScreenAnim: ; 7a55f (1e:655f) +LightScreenAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db $46,$70,$33 db $46,$70,$33 db SE_RESET_SCREEN_PALETTE, $FF db $FF -HazeAnim: ; 7a56a (1e:656a) +HazeAnim: db SE_DARKEN_MON_PALETTE, $FF db SE_WATER_DROPLETS_EVERYWHERE, $38 db SE_RESET_SCREEN_PALETTE, $FF db $FF -ReflectAnim: ; 7a571 (1e:6571) +ReflectAnim: db SE_DARK_SCREEN_PALETTE, $FF db $46,$72,$33 db $46,$72,$33 db SE_RESET_SCREEN_PALETTE, $FF db $FF -FocusEnergyAnim: ; 7a57c (1e:657c) +FocusEnergyAnim: db SE_SPIRAL_BALLS_INWARD, $73 db $FF -BideAnim: ; 7a57f (1e:657f) +BideAnim: db $46,$74,$04 db $FF -MetronomeAnim: ; 7a583 (1e:6583) +MetronomeAnim: db SE_MOVE_MON_HORIZONTALLY, $84 db SE_DELAY_ANIMATION_10, $FF db SE_RESET_MON_POSITION, $84 @@ -879,39 +879,39 @@ MetronomeAnim: ; 7a583 (1e:6583) db SE_RESET_MON_POSITION, $84 db $FF -MirrorMoveAnim: ; 7a592 (1e:6592) +MirrorMoveAnim: db $08,$76,$01 db $FF -SelfdestructAnim: ; 7a596 (1e:6596) +SelfdestructAnim: db $43,$77,$34 db $FF -EggBombAnim: ; 7a59a (1e:659a) +EggBombAnim: db $44,$78,$41 db $44,$78,$42 db $FF -LickAnim: ; 7a5a1 (1e:65a1) +LickAnim: db $46,$7B,$14 db $FF -SmogAnim: ; 7a5a5 (1e:65a5) +SmogAnim: db SE_DARKEN_MON_PALETTE, $48 db $46,$7A,$19 db SE_RESET_SCREEN_PALETTE, $FF db $FF -SludgeAnim: ; 7a5ad (1e:65ad) +SludgeAnim: db $46,$7B,$13 db $46,$7B,$14 db $FF -BoneClubAnim: ; 7a5b4 (1e:65b4) +BoneClubAnim: db $08,$7C,$02 db $FF -FireBlastAnim: ; 7a5b8 (1e:65b8) +FireBlastAnim: db $46,$7D,$1F db $46,$FF,$20 db $46,$FF,$20 @@ -919,47 +919,47 @@ FireBlastAnim: ; 7a5b8 (1e:65b8) db $46,$FF,$0D db $FF -WaterfallAnim: ; 7a5c8 (1e:65c8) +WaterfallAnim: db SE_SLIDE_MON_DOWN, $48 db $06,$37,$1A db $08,$FF,$02 db SE_SLIDE_MON_UP, $FF db $FF -ClampAnim: ; 7a5d3 (1e:65d3) +ClampAnim: db $08,$7F,$2A db $06,$83,$23 db $06,$83,$23 db $FF -SwiftAnim: ; 7a5dd (1e:65dd) +SwiftAnim: db $43,$80,$3F db $FF -SkullBashAnim: ; 7a5e1 (1e:65e1) +SkullBashAnim: db $46,$81,$05 db $FF -SpikeCannonAnim: ; 7a5e5 (1e:65e5) +SpikeCannonAnim: db $44,$82,$04 db $FF -ConstrictAnim: ; 7a5e9 (1e:65e9) +ConstrictAnim: db $06,$83,$23 db $06,$83,$23 db $06,$83,$23 db $FF -AmnesiaAnim: ; 7a5f3 (1e:65f3) +AmnesiaAnim: db $08,$84,$25 db $08,$84,$25 db $FF -KinesisAnim: ; 7a5fa (1e:65fa) +KinesisAnim: db $08,$85,$01 db $FF -SoftboiledAnim: ; 7a5fe (1e:65fe) +SoftboiledAnim: db SE_SLIDE_MON_HALF_OFF, $48 db $08,$86,$4C db SE_LIGHT_SCREEN_PALETTE, $FF @@ -968,34 +968,34 @@ SoftboiledAnim: ; 7a5fe (1e:65fe) db SE_SHOW_MON_PIC, $FF db $FF -HiJumpKickAnim: ; 7a6 (1e:660c) +HiJumpKickAnim: db $46,$87,$04 db $FF -GlareAnim: ; 7a610 (1e:6610) +GlareAnim: db SE_DARK_SCREEN_PALETTE, $48 db SE_DARK_SCREEN_FLASH, $88 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -DreamEaterAnim: ; 7a619 (1e:6619) +DreamEaterAnim: db SE_FLASH_SCREEN_LONG, $89 db SE_DARK_SCREEN_PALETTE, $89 db $08,$89,$02 db SE_RESET_SCREEN_PALETTE, $FF db $FF -PoisonGasAnim: ; 7a623 (1e:6623) +PoisonGasAnim: db $46,$8A,$19 db $FF -BarrageAnim: ; 7a627 (1e:6627) +BarrageAnim: db $43,$8B,$41 db $05,$FF,$55 db $FF -LeechLifeAnim: ; 7a62e (1e:662e) +LeechLifeAnim: db $08,$8C,$02 db SE_DARK_SCREEN_FLASH, $FF db $06,$FF,$21 @@ -1003,264 +1003,264 @@ LeechLifeAnim: ; 7a62e (1e:662e) db SE_DARK_SCREEN_FLASH, $FF db $FF -LovelyKissAnim: ; 7a63c (1e:663c) +LovelyKissAnim: db $06,$8D,$12 db $FF -SkyAttackAnim: ; 7a640 (1e:6640) +SkyAttackAnim: db SE_SQUISH_MON_PIC, $8E db SE_SHOOT_BALLS_UPWARD, $FF db $46,$87,$04 db SE_SHOW_MON_PIC, $FF db $FF -TransformAnim: ; 7a64a (1e:664a) +TransformAnim: db $46,$8F,$21 db $44,$8F,$22 db $08,$FF,$47 db SE_TRANSFORM_MON, $FF db $FF -BubbleAnim: ; 7a656 (1e:6656) +BubbleAnim: db $16,$90,$35 db $FF -DizzyPunchAnim: ; 7a65a (1e:665a) +DizzyPunchAnim: db $06,$91,$17 db $06,$91,$17 db $06,$91,$17 db $06,$02,$02 db $FF -SporeAnim: ; 7a667 (1e:6667) +SporeAnim: db $06,$92,$36 db $FF -FlashAnim: ; 7a66b (1e:666b) +FlashAnim: db SE_LIGHT_SCREEN_PALETTE, $48 db SE_DARK_SCREEN_FLASH, $88 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -PsywaveAnim: ; 7a674 (1e:6674) +PsywaveAnim: db $06,$2F,$31 db SE_WAVY_SCREEN, $5C db $FF -SplashAnim: ; 7a67a (1e:667a) +SplashAnim: db SE_BOUNCE_UP_AND_DOWN, $95 db $FF -AcidArmorAnim: ; 7a67d (1e:667d) +AcidArmorAnim: db SE_SLIDE_MON_DOWN_AND_HIDE, $96 db $FF -CrabHammerAnim: ; 7a680 (1e:6680) +CrabHammerAnim: db $46,$97,$05 db $06,$FF,$2A db $FF -ExplosionAnim: ; 7a687 (1e:6687) +ExplosionAnim: db $43,$98,$34 db $FF -FurySwipesAnim: ; 7a68b (1e:668b) +FurySwipesAnim: db $04,$99,$0F db $FF -BonemerangAnim: ; 7a68f (1e:668f) +BonemerangAnim: db $06,$9A,$02 db $FF -RestAnim: ; 7a693 (1e:6693) +RestAnim: db $10,$9B,$3A db $10,$9B,$3A db $FF -RockSlideAnim: ; 7a69a (1e:669a) +RockSlideAnim: db $04,$9C,$1D db $03,$9C,$1E db $46,$9D,$04 db $FF -HyperFangAnim: ; 7a6a4 (1e:66a4) +HyperFangAnim: db $06,$9D,$02 db $FF -SharpenAnim: ; 7a6a8 (1e:66a8) +SharpenAnim: db SE_LIGHT_SCREEN_PALETTE, $9E db $46,$FF,$43 db SE_DARK_SCREEN_FLASH, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ConversionAnim: ; 7a6b2 (1e:66b2) +ConversionAnim: db SE_DARK_SCREEN_FLASH, $9F db $46,$FF,$21 db $46,$FF,$22 db SE_DARK_SCREEN_FLASH, $FF db $FF -TriAttackAnim: ; 7a6bd (1e:66bd) +TriAttackAnim: db SE_DARK_SCREEN_FLASH, $A0 db $46,$FF,$4D db SE_DARK_SCREEN_FLASH, $FF db $FF -SuperFangAnim: ; 7a6c5 (1e:66c5) +SuperFangAnim: db SE_DARK_SCREEN_PALETTE, $48 db $46,$A1,$04 db SE_RESET_SCREEN_PALETTE, $FF db $FF -SlashAnim: ; 7a6cd (1e:66cd) +SlashAnim: db $06,$A2,$0F db $FF -SubstituteAnim: ; 7a6d1 (1e:66d1) +SubstituteAnim: db SE_SLIDE_MON_OFF, $A3 db $08,$FF,$47 db SE_SUBSTITUTE_MON, $FF db $FF -BallTossAnim: ; 7a6d9 (1e:66d9) +BallTossAnim: db $03,$FF,$06 db $FF -GreatTossAnim: ; 7a6dd (1e:66dd) +GreatTossAnim: db $03,$FF,$07 db $FF -UltraTossAnim: ; 7a6e1 (1e:66e1) +UltraTossAnim: db $02,$FF,$08 db $FF -BallShakeAnim: ; 7a6e5 (1e:66e5) +BallShakeAnim: db $04,$FF,$09 db $FF -BallPoofAnim: ; 7a6e9 (1e:66e9) +BallPoofAnim: db $04,$FF,$0A db $FF -ShowPicAnim: ; 7a6ed (1e:66ed) +ShowPicAnim: db SE_SHOW_ENEMY_MON_PIC, $FF db $FF -HidePicAnim: ; 7a6f0 (1e:66f0) +HidePicAnim: db SE_HIDE_ENEMY_MON_PIC, $FF db $FF -EnemyFlashAnim: ; 7a6f3 (1e:66f3) +EnemyFlashAnim: db SE_SHOW_MON_PIC, $FF db $FF -PlayerFlashAnim: ; 7a6f6 (1e:66f6) +PlayerFlashAnim: db SE_FLASH_MON_PIC, $FF db $FF -EnemyHUDShakeAnim: ; 7a6f9 (1e:66f9) +EnemyHUDShakeAnim: db SE_SHAKE_ENEMY_HUD, $FF db $FF -TradeBallDropAnim: ; 7a6fc (1e:66fc) +TradeBallDropAnim: db $86,$FF,$48 db $FF -TradeBallAppear1Anim: ; 7a700 (1e:6700) +TradeBallAppear1Anim: db $84,$FF,$49 db $FF -TradeBallAppear2Anim: ; 7a704 (1e:6704) +TradeBallAppear2Anim: db $86,$FF,$4A db $FF -TradeBallPoofAnim: ; 7a708 (1e:6708) +TradeBallPoofAnim: db $86,$FF,$4B db $FF -XStatItemAnim: ; 7a7c0 (1e:670c) +XStatItemAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ShrinkingSquareAnim: ; 7a713 (1e:6713) +ShrinkingSquareAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db $46,$FF,$43 db SE_RESET_SCREEN_PALETTE, $FF db $FF -XStatItemBlackAnim: ; 7a71b (1e:671b) +XStatItemBlackAnim: db SE_DARKEN_MON_PALETTE, $FF db SE_SPIRAL_BALLS_INWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ShrinkingSquareBlackAnim: ; 7a722 (1e:6722) +ShrinkingSquareBlackAnim: db SE_DARKEN_MON_PALETTE, $FF db $46,$FF,$43 db SE_RESET_SCREEN_PALETTE, $FF db $FF -UnusedAnim: ; 7a72a (1e:672a) +UnusedAnim: db SE_LIGHT_SCREEN_PALETTE, $FF db SE_SHOOT_MANY_BALLS_UPWARD, $FF db SE_RESET_SCREEN_PALETTE, $FF db $FF -ParalyzeAnim: ; 7a731 (1e:6731) +ParalyzeAnim: db $04,$13,$24 db $04,$13,$24 db $FF -PoisonAnim: ; 7a738 (1e:6738) +PoisonAnim: db $08,$13,$27 db $08,$13,$27 db $FF -SleepPlayerAnim: ; 7a73f (1e:673f) +SleepPlayerAnim: db $10,$9B,$3A db $10,$9B,$3A db $FF -SleepEnemyAnim: ; 7a746 (1e:6746) +SleepEnemyAnim: db $10,$9B,$3B db $10,$9B,$3B db $FF -ConfusedPlayerAnim: ; 7a74d (1e:674d) +ConfusedPlayerAnim: db $08,$84,$25 db $08,$84,$25 db $FF -ConfusedEnemyAnim: ; 7a754 (1e:6754) +ConfusedEnemyAnim: db $08,$84,$26 db $08,$84,$26 db $FF -BallBlockAnim: ; 7a75b (1e:675b) +BallBlockAnim: db $03,$FF,$0B db $FF -FaintAnim: ; 7a75f (1e:675f) +FaintAnim: db SE_SLIDE_MON_DOWN, $5A db $FF -ShakeScreenAnim: ; 7a762 (1e:6762) +ShakeScreenAnim: db SE_SHAKE_SCREEN, $FF db $FF -ThrowRockAnim: ; 7a765 (1e:6765) +ThrowRockAnim: db $03,$8B,$53 db $FF -ThrowBaitAnim: ; 7a769 (1e:6769) +ThrowBaitAnim: db $03,$8B,$54 db $FF -SubanimationPointers: ; 7a76d (1e:676d) +SubanimationPointers: dw Subanimation00 dw Subanimation01 dw Subanimation02 @@ -1348,17 +1348,17 @@ SubanimationPointers: ; 7a76d (1e:676d) dw Subanimation54 dw Subanimation55 -Subanimation04: ; 7a819 (1e:6819) +Subanimation04: db $43 db $02,$1a,$00 db $02,$10,$00 db $02,$03,$00 -Subanimation05: ; 7a823 (1e:6823) +Subanimation05: db $41 db $02,$10,$00 -Subanimation08: ; 7a827 (1e:6827) +Subanimation08: db $0b db $03,$30,$00 db $03,$44,$00 @@ -1372,7 +1372,7 @@ Subanimation08: ; 7a827 (1e:6827) db $03,$a1,$00 db $03,$34,$00 -Subanimation07: ; 7a849 (1e:6849) +Subanimation07: db $0b db $03,$30,$00 db $03,$a2,$00 @@ -1386,7 +1386,7 @@ Subanimation07: ; 7a849 (1e:6849) db $03,$a6,$00 db $03,$34,$00 -Subanimation06: ; 7a86b (1e:686b) +Subanimation06: db $0b db $03,$30,$00 db $03,$a2,$00 @@ -1400,14 +1400,14 @@ Subanimation06: ; 7a86b (1e:686b) db $03,$a9,$00 db $03,$34,$00 -Subanimation09: ; 7a88d (1e:688d) +Subanimation09: db $04 db $03,$21,$04 db $04,$21,$04 db $03,$21,$04 db $05,$21,$04 -Subanimation0a: ; 7a89a (1e:689a) +Subanimation0a: db $46 db $06,$1b,$00 db $07,$1b,$00 @@ -1416,18 +1416,18 @@ Subanimation0a: ; 7a89a (1e:689a) db $0a,$15,$00 db $0a,$15,$00 -Subanimation0b: ; 7a8ad (1e:68ad) +Subanimation0b: db $04 db $01,$2d,$00 db $03,$2f,$00 db $03,$35,$00 db $03,$4d,$00 -Subanimation55: ; 7a8ba (1e:68ba) +Subanimation55: db $41 db $01,$9d,$00 -Subanimation11: ; 7a8be (1e:68be) +Subanimation11: db $4c db $0b,$26,$00 db $0c,$26,$00 @@ -1442,7 +1442,7 @@ Subanimation11: ; 7a8be (1e:68be) db $0b,$27,$00 db $0c,$27,$00 -Subanimation2b: ; 7a8e3 (1e:68e3) +Subanimation2b: db $4b db $0d,$03,$03 db $0e,$03,$03 @@ -1456,7 +1456,7 @@ Subanimation2b: ; 7a8e3 (1e:68e3) db $11,$1b,$00 db $11,$1b,$00 -Subanimation2c: ; 7a905 (1e:6905) +Subanimation2c: db $4c db $12,$01,$00 db $12,$0f,$00 @@ -1471,7 +1471,7 @@ Subanimation2c: ; 7a905 (1e:6905) db $16,$38,$00 db $16,$38,$00 -Subanimation12: ; 7a92a (1e:692a) +Subanimation12: db $69 db $17,$30,$00 db $17,$39,$00 @@ -1483,35 +1483,35 @@ Subanimation12: ; 7a92a (1e:692a) db $17,$3f,$00 db $17,$1f,$00 -Subanimation00: ; 7a946 (1e:6946) +Subanimation00: db $41 db $01,$17,$00 -Subanimation01: ; 7a94a (1e:694a) +Subanimation01: db $42 db $01,$0f,$00 db $01,$1d,$00 -Subanimation02: ; 7a951 (1e:6951) +Subanimation02: db $43 db $01,$12,$00 db $01,$15,$00 db $01,$1c,$00 -Subanimation03: ; 7a95b (1e:695b) +Subanimation03: db $44 db $01,$0b,$00 db $01,$11,$00 db $01,$18,$00 db $01,$1d,$00 -Subanimation0c: ; 7a968 (1e:6968) +Subanimation0c: db $43 db $0c,$20,$00 db $0c,$21,$00 db $0c,$23,$00 -Subanimation0d: ; 7a972 (1e:6972) +Subanimation0d: db $46 db $0c,$20,$02 db $0c,$15,$00 @@ -1520,7 +1520,7 @@ Subanimation0d: ; 7a972 (1e:6972) db $0c,$23,$02 db $0c,$19,$00 -Subanimation0e: ; 7a985 (1e:6985) +Subanimation0e: db $49 db $0c,$20,$02 db $0c,$15,$02 @@ -1532,7 +1532,7 @@ Subanimation0e: ; 7a985 (1e:6985) db $0c,$19,$02 db $0c,$0c,$00 -Subanimation1f: ; 7a9a1 (1e:69a1) +Subanimation1f: db $85 db $0c,$30,$03 db $0c,$40,$03 @@ -1540,7 +1540,7 @@ Subanimation1f: ; 7a9a1 (1e:69a1) db $0c,$42,$03 db $0c,$21,$00 -Subanimation2e: ; 7a9b1 (1e:69b1) +Subanimation2e: db $2e db $18,$43,$02 db $75,$52,$04 @@ -1557,14 +1557,14 @@ Subanimation2e: ; 7a9b1 (1e:69b1) db $1e,$43,$02 db $75,$1b,$00 -Subanimation2f: ; 7a9dc (1e:69dc) +Subanimation2f: db $44 db $1f,$24,$00 db $20,$20,$00 db $21,$1a,$00 db $22,$15,$00 -Subanimation30: ; 7a9e9 (1e:69e9) +Subanimation30: db $52 db $23,$00,$02 db $23,$02,$02 @@ -1585,7 +1585,7 @@ Subanimation30: ; 7a9e9 (1e:69e9) db $24,$28,$00 db $24,$28,$00 -Subanimation0f: ; 7aa20 (1e:6a20) +Subanimation0f: db $4c db $26,$0e,$02 db $26,$16,$02 @@ -1600,7 +1600,7 @@ Subanimation0f: ; 7aa20 (1e:6a20) db $29,$16,$02 db $29,$1c,$00 -Subanimation16: ; 7aa45 (1e:6a45) +Subanimation16: db $4c db $2a,$05,$00 db $2b,$05,$02 @@ -1615,7 +1615,7 @@ Subanimation16: ; 7aa45 (1e:6a45) db $2c,$00,$02 db $2c,$00,$00 -Subanimation10: ; 7aa6a (1e:6a6a) +Subanimation10: db $88 db $2d,$44,$00 db $2e,$45,$00 @@ -1626,7 +1626,7 @@ Subanimation10: ; 7aa6a (1e:6a6a) db $2d,$2f,$00 db $2e,$1a,$00 -Subanimation31: ; 7aa83 (1e:6a83) +Subanimation31: db $2a db $2f,$46,$00 db $2f,$4a,$00 @@ -1639,7 +1639,7 @@ Subanimation31: ; 7aa83 (1e:6a83) db $2f,$2e,$00 db $2f,$51,$00 -Subanimation13: ; 7aaa2 (1e:6aa2) +Subanimation13: db $86 db $30,$31,$00 db $30,$32,$00 @@ -1648,7 +1648,7 @@ Subanimation13: ; 7aaa2 (1e:6aa2) db $30,$0f,$00 db $30,$10,$00 -Subanimation14: ; 7aab5 (1e:6ab5) +Subanimation14: db $49 db $30,$10,$00 db $30,$10,$03 @@ -1660,7 +1660,7 @@ Subanimation14: ; 7aab5 (1e:6ab5) db $31,$22,$04 db $31,$27,$00 -Subanimation41: ; 7aad1 (1e:6ad1) +Subanimation41: db $85 db $03,$31,$00 db $03,$32,$00 @@ -1668,32 +1668,32 @@ Subanimation41: ; 7aad1 (1e:6ad1) db $03,$0e,$00 db $03,$10,$00 -Subanimation42: ; 7aae1 (1e:6ae1) +Subanimation42: db $43 db $48,$08,$00 db $49,$08,$00 db $5a,$08,$00 -Subanimation15: ; 7aaeb (1e:6aeb) +Subanimation15: db $22 db $35,$52,$00 db $35,$53,$00 -Subanimation17: ; 7aaf2 (1e:6af2) +Subanimation17: db $44 db $36,$54,$00 db $36,$55,$00 db $37,$56,$00 db $37,$57,$00 -Subanimation18: ; 7aaff (1e:6aff) +Subanimation18: db $a4 db $36,$54,$00 db $36,$55,$00 db $37,$56,$00 db $37,$57,$00 -Subanimation40: ; 7ab0c (1e:6b0c) +Subanimation40: db $46 db $17,$54,$00 db $17,$55,$00 @@ -1702,7 +1702,7 @@ Subanimation40: ; 7ab0c (1e:6b0c) db $17,$57,$00 db $17,$13,$00 -Subanimation19: ; 7ab1f (1e:6b1f) +Subanimation19: db $8c db $38,$31,$00 db $39,$31,$00 @@ -1717,7 +1717,7 @@ Subanimation19: ; 7ab1f (1e:6b1f) db $38,$10,$00 db $39,$10,$00 -Subanimation1a: ; 7ab44 (1e:6b44) +Subanimation1a: db $50 db $3a,$08,$00 db $3b,$08,$00 @@ -1736,20 +1736,20 @@ Subanimation1a: ; 7ab44 (1e:6b44) db $3e,$0b,$00 db $3f,$0b,$00 -Subanimation1b: ; 7ab75 (1e:6b75) +Subanimation1b: db $84 db $40,$31,$00 db $40,$32,$00 db $40,$92,$00 db $40,$15,$00 -Subanimation1c: ; 7ab82 (1e:6b82) +Subanimation1c: db $43 db $41,$58,$00 db $41,$59,$00 db $41,$21,$00 -Subanimation1d: ; 7ab8c (1e:6b8c) +Subanimation1d: db $af db $24,$9a,$00 db $23,$1b,$02 @@ -1767,22 +1767,22 @@ Subanimation1d: ; 7ab8c (1e:6b8c) db $25,$62,$04 db $25,$99,$03 -Subanimation1e: ; 7abba (1e:6bba) +Subanimation1e: db $01 db $25,$75,$00 -Subanimation20: ; 7abbe (1e:6bbe) +Subanimation20: db $42 db $42,$07,$00 db $43,$07,$00 -Subanimation21: ; 7abc5 (1e:6bc5) +Subanimation21: db $43 db $44,$00,$00 db $45,$08,$00 db $46,$10,$02 -Subanimation22: ; 7abcf (1e:6bcf) +Subanimation22: db $8b db $47,$10,$00 db $47,$56,$00 @@ -1796,7 +1796,7 @@ Subanimation22: ; 7abcf (1e:6bcf) db $47,$89,$00 db $47,$b0,$00 -Subanimation2d: ; 7abf1 (1e:6bf1) +Subanimation2d: db $66 db $44,$64,$00 db $45,$65,$00 @@ -1805,15 +1805,15 @@ Subanimation2d: ; 7abf1 (1e:6bf1) db $47,$66,$00 db $47,$66,$00 -Subanimation39: ; 7ac04 (1e:6c04) +Subanimation39: db $61 db $47,$67,$00 -Subanimation4e: ; 7ac08 (1e:6c08) +Subanimation4e: db $41 db $71,$0f,$03 -Subanimation4f: ; 7ac0c (1e:6c0c) +Subanimation4f: db $47 db $71,$0f,$00 db $71,$08,$00 @@ -1823,7 +1823,7 @@ Subanimation4f: ; 7ac0c (1e:6c0c) db $73,$95,$00 db $74,$95,$00 -Subanimation50: ; 7ac22 (1e:6c22) +Subanimation50: db $48 db $74,$95,$00 db $73,$95,$00 @@ -1834,7 +1834,7 @@ Subanimation50: ; 7ac22 (1e:6c22) db $71,$0f,$00 db $71,$16,$00 -Subanimation29: ; 7ac3b (1e:6c3b) +Subanimation29: db $5d db $48,$0f,$00 db $4a,$68,$03 @@ -1866,63 +1866,63 @@ Subanimation29: ; 7ac3b (1e:6c3b) db $4d,$2a,$03 db $49,$6b,$00 -Subanimation2a: ; 7ac93 (1e:6c93) +Subanimation2a: db $44 db $4e,$2b,$00 db $4f,$2b,$00 db $50,$2b,$00 db $50,$2b,$00 -Subanimation23: ; 7aca0 (1e:6ca0) +Subanimation23: db $42 db $51,$2d,$00 db $51,$6e,$00 -Subanimation24: ; 7aca7 (1e:6ca7) +Subanimation24: db $a2 db $51,$2d,$00 db $51,$6e,$00 -Subanimation25: ; 7acae (1e:6cae) +Subanimation25: db $62 db $52,$71,$00 db $52,$72,$00 -Subanimation26: ; 7acb5 (1e:6cb5) +Subanimation26: db $02 db $52,$01,$00 db $52,$2c,$00 -Subanimation3a: ; 7acbc (1e:6cbc) +Subanimation3a: db $63 db $53,$71,$00 db $53,$7f,$00 db $53,$81,$00 -Subanimation3b: ; 7acc6 (1e:6cc6) +Subanimation3b: db $03 db $53,$01,$00 db $53,$15,$00 db $53,$2c,$00 -Subanimation27: ; 7acd0 (1e:6cd0) +Subanimation27: db $a2 db $54,$01,$00 db $54,$2c,$00 -Subanimation28: ; 7acd7 (1e:6cd7) +Subanimation28: db $23 db $55,$73,$03 db $56,$73,$03 db $57,$73,$00 -Subanimation32: ; 7ace1 (1e:6ce1) +Subanimation32: db $63 db $47,$74,$00 db $47,$43,$00 db $47,$75,$00 -Subanimation33: ; 7aceb (1e:6ceb) +Subanimation33: db $26 db $58,$76,$00 db $34,$76,$00 @@ -1931,7 +1931,7 @@ Subanimation33: ; 7aceb (1e:6ceb) db $58,$76,$00 db $34,$76,$00 -Subanimation3c: ; 7acfe (1e:6cfe) +Subanimation3c: db $67 db $59,$79,$03 db $59,$7b,$03 @@ -1941,7 +1941,7 @@ Subanimation3c: ; 7acfe (1e:6cfe) db $59,$7c,$03 db $59,$76,$00 -Subanimation3d: ; 7ad14 (1e:6d14) +Subanimation3d: db $08 db $3a,$4d,$00 db $3b,$4d,$00 @@ -1952,7 +1952,7 @@ Subanimation3d: ; 7ad14 (1e:6d14) db $3e,$4d,$00 db $3f,$4d,$00 -Subanimation34: ; 7ad2d (1e:6d2d) +Subanimation34: db $35 db $48,$7d,$00 db $49,$7d,$00 @@ -1976,14 +1976,14 @@ Subanimation34: ; 7ad2d (1e:6d2d) db $49,$82,$00 db $5a,$82,$00 -Subanimation35: ; 7ad6d (1e:6d6d) +Subanimation35: db $24 db $5b,$83,$03 db $5c,$84,$03 db $5d,$85,$03 db $5e,$09,$00 -Subanimation36: ; 7ad7a (1e:6d7a) +Subanimation36: db $48 db $5f,$2a,$00 db $5f,$00,$00 @@ -1994,7 +1994,7 @@ Subanimation36: ; 7ad7a (1e:6d7a) db $62,$2a,$00 db $62,$00,$00 -Subanimation37: ; 7ad93 (1e:6d93) +Subanimation37: db $2a db $63,$89,$00 db $64,$75,$00 @@ -2007,7 +2007,7 @@ Subanimation37: ; 7ad93 (1e:6d93) db $65,$88,$00 db $65,$1a,$00 -Subanimation38: ; 7adb2 (1e:6db2) +Subanimation38: db $50 db $66,$8a,$00 db $66,$33,$00 @@ -2026,7 +2026,7 @@ Subanimation38: ; 7adb2 (1e:6db2) db $66,$1e,$04 db $67,$29,$00 -Subanimation3e: ; 7ade3 (1e:6de3) +Subanimation3e: db $92 db $02,$31,$00 db $34,$31,$00 @@ -2047,7 +2047,7 @@ Subanimation3e: ; 7ade3 (1e:6de3) db $34,$10,$00 db $02,$10,$00 -Subanimation3f: ; 7ae1a (1e:6e1a) +Subanimation3f: db $72 db $68,$4b,$00 db $68,$8c,$00 @@ -2068,7 +2068,7 @@ Subanimation3f: ; 7ae1a (1e:6e1a) db $68,$23,$00 db $68,$1f,$00 -Subanimation44: ; 7ae51 (1e:6e51) +Subanimation44: db $2c db $69,$4b,$00 db $69,$8c,$00 @@ -2083,20 +2083,20 @@ Subanimation44: ; 7ae51 (1e:6e51) db $69,$0c,$00 db $69,$06,$00 -Subanimation43: ; 7ae76 (1e:6e76) +Subanimation43: db $a3 db $6a,$07,$00 db $6b,$0f,$00 db $6c,$17,$00 -Subanimation45: ; 7ae80 (1e:6e80) +Subanimation45: db $24 db $6d,$8b,$00 db $6d,$84,$00 db $6d,$63,$00 db $6d,$8c,$00 -Subanimation46: ; 7ae8d (1e:6e8d) +Subanimation46: db $26 db $6d,$8b,$00 db $6d,$84,$00 @@ -2105,13 +2105,13 @@ Subanimation46: ; 7ae8d (1e:6e8d) db $6d,$0a,$00 db $6d,$89,$00 -Subanimation47: ; 7aea0 (1e:6ea0) +Subanimation47: db $23 db $06,$82,$00 db $07,$82,$00 db $08,$96,$00 -Subanimation48: ; 7aeaa (1e:6eaa) +Subanimation48: db $06 db $03,$41,$04 db $03,$48,$04 @@ -2120,24 +2120,24 @@ Subanimation48: ; 7aeaa (1e:6eaa) db $05,$48,$04 db $03,$48,$03 -Subanimation49: ; 7aebd (1e:6ebd) +Subanimation49: db $04 db $04,$48,$04 db $03,$48,$04 db $05,$48,$04 db $03,$48,$03 -Subanimation4a: ; 7aeca (1e:6eca) +Subanimation4a: db $01 db $04,$84,$03 -Subanimation4b: ; 7aece (1e:6ece) +Subanimation4b: db $03 db $06,$72,$00 db $07,$72,$00 db $08,$72,$00 -Subanimation4c: ; 7aed8 (1e:6ed8) +Subanimation4c: db $68 db $6f,$30,$00 db $6e,$30,$00 @@ -2148,7 +2148,7 @@ Subanimation4c: ; 7aed8 (1e:6ed8) db $70,$30,$00 db $6e,$30,$00 -Subanimation4d: ; 7aef1 (1e:6ef1) +Subanimation4d: db $26 db $32,$4b,$00 db $33,$4f,$00 @@ -2157,7 +2157,7 @@ Subanimation4d: ; 7aef1 (1e:6ef1) db $32,$19,$00 db $33,$0d,$00 -Subanimation51: ; 7af04 (1e:6f04) +Subanimation51: db $a6 db $76,$1b,$00 db $34,$1b,$00 @@ -2166,7 +2166,7 @@ Subanimation51: ; 7af04 (1e:6f04) db $76,$1b,$00 db $34,$1b,$00 -Subanimation52: ; 7af17 (1e:6f17) +Subanimation52: db $47 db $77,$25,$00 db $77,$9b,$00 @@ -2176,7 +2176,7 @@ Subanimation52: ; 7af17 (1e:6f17) db $77,$50,$00 db $77,$8c,$00 -Subanimation53: ; 7af2d (1e:6f2d) +Subanimation53: db $0c db $78,$30,$00 db $78,$a2,$00 @@ -2191,7 +2191,7 @@ Subanimation53: ; 7af2d (1e:6f2d) db $78,$34,$00 db $01,$9e,$00 -Subanimation54: ; 7af52 (1e:6f52) +Subanimation54: db $0b db $79,$30,$00 db $79,$a2,$00 @@ -2205,7 +2205,7 @@ Subanimation54: ; 7af52 (1e:6f52) db $79,$a9,$00 db $79,$34,$00 -FrameBlockPointers: ; 7af74 (1e:6f74) +FrameBlockPointers: dw FrameBlock00 dw FrameBlock01 dw FrameBlock02 @@ -2337,7 +2337,7 @@ FrameBlockPointers: ; 7af74 (1e:6f74) ; second byte = x offset ; third byte = tile id (it's actually tile id - $31) ; fourth byte = tile properties (xflip/yflip/etc.) -FrameBlock01: ; 7b068 (1e:7068) +FrameBlock01: db $09 db $00,$00,$2c,$00 db $00,$08,$2d,$00 @@ -2349,7 +2349,7 @@ FrameBlock01: ; 7b068 (1e:7068) db $10,$08,$2d,$40 db $10,$10,$2c,$60 -FrameBlock02: ; 7b08d (1e:708d) +FrameBlock02: db $10 db $00,$00,$20,$00 db $00,$08,$21,$00 @@ -2368,28 +2368,28 @@ FrameBlock02: ; 7b08d (1e:708d) db $18,$10,$21,$60 db $18,$18,$20,$60 -FrameBlock03: ; 7b0ce (1e:70ce) +FrameBlock03: db $04 db $00,$00,$02,$00 db $00,$08,$02,$20 db $08,$00,$12,$00 db $08,$08,$12,$20 -FrameBlock04: ; 7b0df (1e:70df) +FrameBlock04: db $04 db $00,$00,$06,$00 db $00,$08,$07,$00 db $08,$00,$16,$00 db $08,$08,$17,$00 -FrameBlock05: ; 7b0f0 (1e:70f0) +FrameBlock05: db $04 db $00,$00,$07,$20 db $00,$08,$06,$20 db $08,$00,$17,$20 db $08,$08,$16,$20 -FrameBlock06: ; 7b101 (1e:7101) +FrameBlock06: db $0c db $00,$08,$23,$00 db $08,$00,$32,$00 @@ -2404,7 +2404,7 @@ FrameBlock06: ; 7b101 (1e:7101) db $10,$18,$32,$60 db $18,$10,$23,$60 -FrameBlock07: ; 7b132 (1e:7132) +FrameBlock07: db $10 db $00,$00,$20,$00 db $00,$08,$21,$00 @@ -2423,7 +2423,7 @@ FrameBlock07: ; 7b132 (1e:7132) db $18,$10,$21,$60 db $18,$18,$20,$60 -FrameBlock08: ; 7b173 (1e:7173) +FrameBlock08: db $10 db $00,$00,$20,$00 db $00,$08,$21,$00 @@ -2442,7 +2442,7 @@ FrameBlock08: ; 7b173 (1e:7173) db $20,$18,$21,$60 db $20,$20,$20,$60 -FrameBlock09: ; 7b1b4 (1e:71b4) +FrameBlock09: db $0c db $00,$00,$24,$00 db $00,$08,$25,$00 @@ -2457,7 +2457,7 @@ FrameBlock09: ; 7b1b4 (1e:71b4) db $20,$18,$25,$60 db $20,$20,$24,$60 -FrameBlock0a: ; 7b1e5 (1e:71e5) +FrameBlock0a: db $0c db $00,$00,$24,$00 db $00,$08,$25,$00 @@ -2472,21 +2472,21 @@ FrameBlock0a: ; 7b1e5 (1e:71e5) db $28,$20,$25,$60 db $28,$28,$24,$60 -FrameBlock0b: ; 7b216 (1e:7216) +FrameBlock0b: db $04 db $00,$00,$05,$00 db $00,$08,$05,$20 db $08,$00,$15,$00 db $08,$08,$15,$20 -FrameBlock0c: ; 7b227 (1e:7227) +FrameBlock0c: db $04 db $00,$00,$04,$00 db $00,$08,$04,$20 db $08,$00,$14,$00 db $08,$08,$14,$20 -FrameBlock0d: ; 7b238 (1e:7238) +FrameBlock0d: db $08 db $00,$00,$0c,$00 db $00,$08,$0d,$00 @@ -2497,21 +2497,21 @@ FrameBlock0d: ; 7b238 (1e:7238) db $18,$00,$0d,$60 db $18,$08,$0c,$60 -FrameBlock0e: ; 7b259 (1e:7259) +FrameBlock0e: db $04 db $20,$00,$0c,$00 db $20,$08,$0d,$00 db $28,$00,$1c,$00 db $28,$08,$1d,$00 -FrameBlock0f: ; 7b26a (1e:726a) +FrameBlock0f: db $04 db $30,$00,$1d,$60 db $30,$08,$1c,$60 db $38,$00,$0d,$60 db $38,$08,$0c,$60 -FrameBlock10: ; 7b27b (1e:727b) +FrameBlock10: db $08 db $00,$00,$0e,$00 db $00,$08,$0f,$00 @@ -2522,7 +2522,7 @@ FrameBlock10: ; 7b27b (1e:727b) db $08,$10,$1f,$20 db $08,$18,$1e,$20 -FrameBlock11: ; 7b29c (1e:729c) +FrameBlock11: db $08 db $00,$00,$0e,$00 db $00,$08,$0f,$00 @@ -2533,20 +2533,20 @@ FrameBlock11: ; 7b29c (1e:729c) db $08,$20,$1f,$20 db $08,$28,$1e,$20 -FrameBlock12: ; 7b2bd (1e:72bd) +FrameBlock12: db $03 db $00,$00,$37,$00 db $08,$10,$37,$00 db $00,$20,$37,$00 -FrameBlock13: ; 7b2ca (1e:72ca) +FrameBlock13: db $04 db $00,$00,$36,$00 db $00,$08,$36,$20 db $08,$00,$36,$40 db $08,$08,$36,$60 -FrameBlock14: ; 7b2db (1e:72db) +FrameBlock14: db $08 db $00,$10,$28,$00 db $00,$18,$28,$20 @@ -2557,7 +2557,7 @@ FrameBlock14: ; 7b2db (1e:72db) db $08,$20,$36,$40 db $08,$28,$36,$60 -FrameBlock15: ; 7b2fc (1e:72fc) +FrameBlock15: db $0c db $00,$00,$28,$00 db $00,$08,$28,$20 @@ -2572,7 +2572,7 @@ FrameBlock15: ; 7b2fc (1e:72fc) db $08,$20,$38,$00 db $08,$28,$38,$20 -FrameBlock16: ; 7b32d (1e:732d) +FrameBlock16: db $08 db $00,$00,$29,$00 db $00,$08,$29,$20 @@ -2583,60 +2583,60 @@ FrameBlock16: ; 7b32d (1e:732d) db $08,$20,$39,$00 db $08,$28,$39,$20 -FrameBlock17: ; 7b34e (1e:734e) +FrameBlock17: db $04 db $00,$00,$08,$00 db $00,$08,$09,$00 db $08,$00,$18,$00 db $08,$08,$19,$00 -FrameBlock18: ; 7b35f (1e:735f) +FrameBlock18: db $01 db $18,$00,$45,$60 -FrameBlock19: ; 7b364 (1e:7364) +FrameBlock19: db $02 db $18,$08,$45,$00 db $10,$08,$46,$60 -FrameBlock1a: ; 7b36d (1e:736d) +FrameBlock1a: db $02 db $10,$10,$45,$60 db $18,$10,$46,$00 -FrameBlock1b: ; 7b376 (1e:7376) +FrameBlock1b: db $02 db $10,$18,$45,$00 db $08,$18,$46,$60 -FrameBlock1c: ; 7b37f (1e:737f) +FrameBlock1c: db $02 db $08,$20,$45,$60 db $10,$20,$46,$00 -FrameBlock1d: ; 7b388 (1e:7388) +FrameBlock1d: db $02 db $08,$28,$45,$00 db $00,$28,$46,$60 -FrameBlock1e: ; 7b391 (1e:7391) +FrameBlock1e: db $02 db $00,$30,$45,$60 db $08,$30,$46,$00 -FrameBlock75: ; 7b39a (1e:739a) +FrameBlock75: db $04 db $00,$00,$43,$00 db $00,$08,$43,$20 db $08,$00,$22,$00 db $08,$08,$43,$60 -FrameBlock1f: ; 7b3ab (1e:73ab) +FrameBlock1f: db $02 db $00,$00,$03,$00 db $00,$30,$03,$20 -FrameBlock20: ; 7b3b4 (1e:73b4) +FrameBlock20: db $06 db $00,$00,$03,$00 db $00,$30,$03,$20 @@ -2645,7 +2645,7 @@ FrameBlock20: ; 7b3b4 (1e:73b4) db $08,$00,$13,$00 db $08,$30,$13,$20 -FrameBlock21: ; 7b3cd (1e:73cd) +FrameBlock21: db $0c db $00,$00,$03,$00 db $00,$30,$03,$20 @@ -2660,7 +2660,7 @@ FrameBlock21: ; 7b3cd (1e:73cd) db $10,$00,$03,$00 db $10,$30,$03,$20 -FrameBlock22: ; 7b3fe (1e:73fe) +FrameBlock22: db $13 db $00,$00,$03,$00 db $08,$00,$13,$00 @@ -2682,19 +2682,19 @@ FrameBlock22: ; 7b3fe (1e:73fe) db $10,$30,$03,$20 db $18,$30,$13,$20 -FrameBlock23: ; 7b44b (1e:744b) +FrameBlock23: db $04 db $00,$00,$0a,$00 db $00,$08,$0b,$00 db $08,$00,$1a,$00 db $08,$08,$1b,$00 -FrameBlock24: ; 7b45c (1e:745c) +FrameBlock24: db $02 db $08,$00,$0a,$00 db $08,$08,$0b,$00 -FrameBlock25: ; 7b465 (1e:7465) +FrameBlock25: db $0c db $10,$00,$0a,$00 db $10,$08,$0b,$00 @@ -2709,14 +2709,14 @@ FrameBlock25: ; 7b465 (1e:7465) db $10,$20,$1a,$00 db $10,$28,$1b,$00 -FrameBlock26: ; 7b496 (1e:7496) +FrameBlock26: db $04 db $00,$10,$44,$00 db $00,$18,$44,$20 db $08,$10,$44,$40 db $08,$18,$44,$60 -FrameBlock27: ; 7b4a7 (1e:74a7) +FrameBlock27: db $05 db $08,$08,$44,$00 db $08,$10,$44,$20 @@ -2724,7 +2724,7 @@ FrameBlock27: ; 7b4a7 (1e:74a7) db $10,$10,$44,$60 db $00,$18,$47,$00 -FrameBlock28: ; 7b4bc (1e:74bc) +FrameBlock28: db $06 db $10,$00,$44,$00 db $10,$08,$44,$20 @@ -2733,30 +2733,30 @@ FrameBlock28: ; 7b4bc (1e:74bc) db $08,$10,$47,$00 db $02,$16,$47,$00 -FrameBlock29: ; 7b4d5 (1e:74d5) +FrameBlock29: db $04 db $18,$00,$47,$00 db $12,$06,$47,$00 db $0c,$0c,$47,$00 db $06,$12,$47,$00 -FrameBlock2a: ; 7b4e6 (1e:74e6) +FrameBlock2a: db $04 db $00,$00,$44,$00 db $00,$08,$44,$20 db $08,$00,$44,$40 db $08,$08,$44,$60 -FrameBlock2b: ; 7b4f7 (1e:74f7) +FrameBlock2b: db $02 db $06,$02,$47,$00 db $00,$08,$47,$00 -FrameBlock2c: ; 7b500 (1e:7500) +FrameBlock2c: db $01 db $a0,$00,$4d,$00 -FrameBlock2d: ; 7b505 (1e:7505) +FrameBlock2d: db $08 db $00,$00,$26,$00 db $00,$08,$27,$00 @@ -2767,7 +2767,7 @@ FrameBlock2d: ; 7b505 (1e:7505) db $18,$00,$38,$00 db $18,$08,$39,$00 -FrameBlock2e: ; 7b526 (1e:7526) +FrameBlock2e: db $08 db $00,$00,$27,$20 db $00,$08,$26,$20 @@ -2778,25 +2778,25 @@ FrameBlock2e: ; 7b526 (1e:7526) db $18,$00,$39,$20 db $18,$08,$38,$20 -FrameBlock2f: ; 7b547 (1e:7547) +FrameBlock2f: db $04 db $00,$00,$0c,$00 db $00,$08,$0d,$00 db $08,$00,$0c,$40 db $08,$08,$0d,$40 -FrameBlock30: ; 7b558 (1e:7558) +FrameBlock30: db $04 db $00,$00,$44,$00 db $00,$08,$44,$20 db $08,$00,$44,$40 db $08,$08,$44,$60 -FrameBlock31: ; 7b569 (1e:7569) +FrameBlock31: db $01 db $00,$00,$45,$00 -FrameBlock32: ; 7b56e (1e:756e) +FrameBlock32: db $07 db $00,$00,$4d,$00 db $00,$08,$2f,$00 @@ -2806,7 +2806,7 @@ FrameBlock32: ; 7b56e (1e:756e) db $08,$10,$4e,$20 db $10,$08,$3f,$00 -FrameBlock33: ; 7b58b (1e:758b) +FrameBlock33: db $07 db $00,$08,$3f,$40 db $08,$00,$4e,$40 @@ -2816,11 +2816,11 @@ FrameBlock33: ; 7b58b (1e:758b) db $10,$08,$2f,$40 db $10,$10,$4d,$60 -FrameBlock34: ; 7b5a8 (1e:75a8) +FrameBlock34: db $01 db $a0,$00,$00,$10 -FrameBlock35: ; 7b5ad (1e:75ad) +FrameBlock35: db $06 db $00,$00,$2a,$00 db $00,$08,$2b,$00 @@ -2829,42 +2829,42 @@ FrameBlock35: ; 7b5ad (1e:75ad) db $18,$00,$2a,$40 db $18,$08,$2b,$40 -FrameBlock36: ; 7b5c6 (1e:75c6) +FrameBlock36: db $04 db $00,$00,$00,$00 db $00,$08,$01,$00 db $08,$00,$10,$00 db $08,$08,$11,$00 -FrameBlock37: ; 7b5d7 (1e:75d7) +FrameBlock37: db $04 db $00,$00,$01,$a0 db $00,$08,$00,$a0 db $08,$00,$11,$a0 db $08,$08,$10,$a0 -FrameBlock38: ; 7b5e8 (1e:75e8) +FrameBlock38: db $04 db $00,$00,$0a,$00 db $00,$08,$0b,$00 db $08,$00,$1a,$00 db $08,$08,$1b,$00 -FrameBlock39: ; 7b5f9 (1e:75f9) +FrameBlock39: db $04 db $00,$00,$0b,$20 db $00,$08,$0a,$20 db $08,$00,$1b,$20 db $08,$08,$1a,$20 -FrameBlock3a: ; 7b60a (1e:760a) +FrameBlock3a: db $04 db $20,$00,$05,$00 db $20,$08,$05,$20 db $28,$00,$15,$00 db $28,$08,$15,$20 -FrameBlock3b: ; 7b61b (1e:761b) +FrameBlock3b: db $05 db $18,$00,$04,$00 db $18,$08,$04,$20 @@ -2872,7 +2872,7 @@ FrameBlock3b: ; 7b61b (1e:761b) db $20,$08,$14,$20 db $28,$04,$41,$00 -FrameBlock3c: ; 7b630 (1e:7630) +FrameBlock3c: db $06 db $10,$00,$05,$00 db $10,$08,$05,$20 @@ -2881,7 +2881,7 @@ FrameBlock3c: ; 7b630 (1e:7630) db $20,$04,$42,$00 db $28,$04,$42,$00 -FrameBlock3d: ; 7b649 (1e:7649) +FrameBlock3d: db $07 db $08,$00,$04,$00 db $08,$08,$04,$20 @@ -2891,7 +2891,7 @@ FrameBlock3d: ; 7b649 (1e:7649) db $20,$04,$41,$00 db $28,$04,$41,$00 -FrameBlock3e: ; 7b666 (1e:7666) +FrameBlock3e: db $08 db $00,$00,$05,$00 db $00,$08,$05,$20 @@ -2902,7 +2902,7 @@ FrameBlock3e: ; 7b666 (1e:7666) db $20,$04,$42,$00 db $28,$04,$42,$00 -FrameBlock3f: ; 7b687 (1e:7687) +FrameBlock3f: db $08 db $00,$00,$04,$00 db $00,$08,$04,$20 @@ -2913,20 +2913,20 @@ FrameBlock3f: ; 7b687 (1e:7687) db $20,$04,$41,$00 db $28,$04,$41,$00 -FrameBlock40: ; 7b6a8 (1e:76a8) +FrameBlock40: db $03 db $00,$00,$3d,$00 db $00,$08,$3d,$00 db $08,$08,$3d,$00 -FrameBlock41: ; 7b6b5 (1e:76b5) +FrameBlock41: db $04 db $00,$00,$06,$00 db $00,$08,$06,$20 db $08,$00,$16,$00 db $08,$08,$17,$00 -FrameBlock42: ; 7b6c6 (1e:76c6) +FrameBlock42: db $0b db $00,$10,$42,$00 db $08,$00,$42,$00 @@ -2940,7 +2940,7 @@ FrameBlock42: ; 7b6c6 (1e:76c6) db $20,$00,$42,$00 db $20,$20,$42,$00 -FrameBlock43: ; 7b6f3 (1e:76f3) +FrameBlock43: db $0b db $00,$10,$41,$00 db $08,$00,$41,$00 @@ -2954,42 +2954,42 @@ FrameBlock43: ; 7b6f3 (1e:76f3) db $20,$00,$41,$00 db $20,$20,$41,$00 -FrameBlock44: ; 7b720 (1e:7720) +FrameBlock44: db $04 db $00,$00,$49,$00 db $00,$28,$49,$00 db $28,$00,$49,$00 db $28,$28,$49,$00 -FrameBlock45: ; 7b731 (1e:7731) +FrameBlock45: db $04 db $00,$00,$49,$00 db $00,$18,$49,$00 db $18,$00,$49,$00 db $18,$18,$49,$00 -FrameBlock46: ; 7b742 (1e:7742) +FrameBlock46: db $04 db $00,$00,$49,$00 db $00,$08,$49,$00 db $08,$00,$49,$00 db $08,$08,$49,$00 -FrameBlock47: ; 7b753 (1e:7753) +FrameBlock47: db $04 db $00,$00,$43,$00 db $00,$08,$43,$20 db $08,$00,$43,$40 db $08,$08,$43,$60 -SmallBlackCircleFrameBlock: ; 7b764 (1e:7764) +SmallBlackCircleFrameBlock: db $04 db $08,$08,$33,$00 db $08,$10,$33,$20 db $10,$08,$33,$40 db $10,$10,$33,$60 -LargeBlockCircleFrameBlock: ; 7b775 (1e:7775) +LargeBlockCircleFrameBlock: db $10 db $00,$00,$22,$00 db $00,$08,$23,$00 @@ -3008,7 +3008,7 @@ LargeBlockCircleFrameBlock: ; 7b775 (1e:7775) db $18,$10,$23,$60 db $18,$18,$22,$60 -FrameBlock71: ; 7b7b6 (1e:77b6) +FrameBlock71: db $10 db $00,$00,$22,$00 db $00,$08,$3b,$00 @@ -3027,7 +3027,7 @@ FrameBlock71: ; 7b7b6 (1e:77b6) db $18,$10,$23,$60 db $18,$18,$22,$60 -FrameBlock72: ; 7b7f7 (1e:77f7) +FrameBlock72: db $0c db $00,$00,$32,$00 db $00,$08,$43,$00 @@ -3042,7 +3042,7 @@ FrameBlock72: ; 7b7f7 (1e:77f7) db $10,$10,$23,$60 db $10,$18,$22,$60 -FrameBlock73: ; 7b828 (1e:7828) +FrameBlock73: db $08 db $00,$00,$32,$40 db $00,$08,$43,$40 @@ -3053,42 +3053,42 @@ FrameBlock73: ; 7b828 (1e:7828) db $08,$10,$23,$60 db $08,$18,$22,$60 -FrameBlock74: ; 7b849 (1e:7849) +FrameBlock74: db $04 db $00,$00,$22,$40 db $00,$08,$23,$40 db $00,$10,$23,$60 db $00,$18,$22,$60 -FrameBlock4a: ; 7b85a (1e:785a) +FrameBlock4a: db $04 db $08,$18,$4c,$20 db $20,$08,$4b,$00 db $30,$20,$4c,$00 db $18,$30,$4b,$40 -FrameBlock4b: ; 7b86b (1e:786b) +FrameBlock4b: db $04 db $00,$18,$4c,$00 db $20,$00,$4b,$40 db $38,$20,$4c,$20 db $18,$38,$4b,$00 -FrameBlock4c: ; 7b87c (1e:787c) +FrameBlock4c: db $04 db $10,$08,$4a,$40 db $30,$10,$4a,$00 db $28,$30,$4a,$20 db $08,$28,$4a,$60 -FrameBlock4d: ; 7b88d (1e:788d) +FrameBlock4d: db $04 db $08,$00,$4a,$20 db $38,$08,$4a,$60 db $30,$38,$4a,$40 db $00,$30,$4a,$00 -FrameBlock4e: ; 7b89e (1e:789e) +FrameBlock4e: db $08 db $00,$30,$44,$00 db $00,$38,$44,$20 @@ -3099,7 +3099,7 @@ FrameBlock4e: ; 7b89e (1e:789e) db $2e,$0a,$44,$40 db $2e,$12,$44,$60 -FrameBlock4f: ; 7b8bf (1e:78bf) +FrameBlock4f: db $0c db $0e,$22,$44,$00 db $0e,$2a,$44,$20 @@ -3114,7 +3114,7 @@ FrameBlock4f: ; 7b8bf (1e:78bf) db $30,$08,$47,$00 db $2a,$0e,$47,$00 -FrameBlock50: ; 7b8f0 (1e:78f0) +FrameBlock50: db $08 db $06,$32,$47,$00 db $00,$38,$47,$00 @@ -3125,7 +3125,7 @@ FrameBlock50: ; 7b8f0 (1e:78f0) db $2a,$0e,$47,$00 db $24,$14,$47,$00 -FrameBlock51: ; 7b911 (1e:7911) +FrameBlock51: db $08 db $00,$00,$35,$20 db $08,$00,$35,$40 @@ -3136,33 +3136,33 @@ FrameBlock51: ; 7b911 (1e:7911) db $10,$40,$35,$20 db $18,$40,$35,$40 -FrameBlock52: ; 7b932 (1e:7932) +FrameBlock52: db $04 db $00,$00,$2a,$00 db $00,$08,$2b,$00 db $08,$00,$3a,$00 db $08,$08,$3b,$00 -FrameBlock53: ; 7b943 (1e:7943) +FrameBlock53: db $03 db $00,$00,$3f,$00 db $00,$08,$3f,$00 db $08,$06,$3f,$00 -FrameBlock54: ; 7b950 (1e:7950) +FrameBlock54: db $04 db $00,$00,$0e,$00 db $00,$08,$0e,$20 db $08,$00,$0f,$00 db $08,$08,$0f,$20 -FrameBlock55: ; 7b961 (1e:7961) +FrameBlock55: db $03 db $10,$00,$2c,$00 db $10,$08,$3c,$00 db $10,$10,$2d,$00 -FrameBlock56: ; 7b96e (1e:796e) +FrameBlock56: db $06 db $10,$10,$31,$00 db $10,$18,$31,$00 @@ -3171,7 +3171,7 @@ FrameBlock56: ; 7b96e (1e:796e) db $08,$20,$2d,$00 db $10,$20,$2d,$00 -FrameBlock57: ; 7b987 (1e:7987) +FrameBlock57: db $09 db $08,$20,$31,$00 db $10,$20,$31,$00 @@ -3183,7 +3183,7 @@ FrameBlock57: ; 7b987 (1e:7987) db $08,$30,$2d,$00 db $10,$30,$2d,$00 -FrameBlock58: ; 7b9ac (1e:79ac) +FrameBlock58: db $07 db $00,$00,$46,$00 db $08,$02,$47,$00 @@ -3193,11 +3193,11 @@ FrameBlock58: ; 7b9ac (1e:79ac) db $28,$05,$48,$00 db $30,$05,$48,$00 -FrameBlock59: ; 7b9c9 (1e:79c9) +FrameBlock59: db $01 db $00,$00,$42,$00 -FrameBlock5a: ; 7b9ce (1e:79ce) +FrameBlock5a: db $0c db $00,$00,$24,$00 db $00,$08,$25,$00 @@ -3212,14 +3212,14 @@ FrameBlock5a: ; 7b9ce (1e:79ce) db $18,$10,$25,$60 db $18,$18,$24,$60 -FrameBlock5b: ; 7b9ff (1e:79ff) +FrameBlock5b: db $04 db $00,$00,$43,$00 db $00,$08,$43,$20 db $08,$00,$43,$40 db $08,$08,$43,$60 -FrameBlock5c: ; 7ba10 (1e:7a10) +FrameBlock5c: db $08 db $00,$00,$49,$00 db $02,$08,$49,$00 @@ -3230,7 +3230,7 @@ FrameBlock5c: ; 7ba10 (1e:7a10) db $10,$00,$43,$40 db $10,$08,$43,$60 -FrameBlock5d: ; 7ba31 (1e:7a31) +FrameBlock5d: db $0b db $00,$00,$49,$00 db $18,$02,$49,$00 @@ -3244,7 +3244,7 @@ FrameBlock5d: ; 7ba31 (1e:7a31) db $0c,$08,$43,$40 db $0c,$10,$43,$60 -FrameBlock5e: ; 7ba5e (1e:7a5e) +FrameBlock5e: db $0f db $00,$08,$49,$00 db $08,$10,$49,$00 @@ -3262,14 +3262,14 @@ FrameBlock5e: ; 7ba5e (1e:7a5e) db $28,$08,$43,$40 db $28,$10,$43,$60 -FrameBlock5f: ; 7ba9b (1e:7a9b) +FrameBlock5f: db $04 db $00,$00,$49,$00 db $00,$10,$49,$00 db $00,$20,$49,$00 db $00,$30,$49,$00 -FrameBlock60: ; 7baac (1e:7aac) +FrameBlock60: db $08 db $00,$00,$49,$00 db $00,$10,$49,$00 @@ -3280,7 +3280,7 @@ FrameBlock60: ; 7baac (1e:7aac) db $08,$28,$49,$00 db $08,$38,$49,$00 -FrameBlock61: ; 7bacd (1e:7acd) +FrameBlock61: db $0c db $00,$00,$49,$00 db $00,$10,$49,$00 @@ -3295,7 +3295,7 @@ FrameBlock61: ; 7bacd (1e:7acd) db $10,$20,$49,$00 db $10,$30,$49,$00 -FrameBlock62: ; 7bafe (1e:7afe) +FrameBlock62: db $0f db $00,$00,$49,$00 db $00,$10,$49,$00 @@ -3314,7 +3314,7 @@ FrameBlock62: ; 7bafe (1e:7afe) db $18,$28,$49,$00 db $18,$38,$49,$00 ; unused -FrameBlock63: ; 7bb3f (1e:7b3f) +FrameBlock63: db $06 db $10,$00,$26,$00 db $10,$08,$27,$00 @@ -3323,7 +3323,7 @@ FrameBlock63: ; 7bb3f (1e:7b3f) db $00,$20,$26,$00 db $00,$28,$27,$00 -FrameBlock64: ; 7bb58 (1e:7b58) +FrameBlock64: db $06 db $18,$00,$27,$00 db $10,$08,$26,$00 @@ -3332,7 +3332,7 @@ FrameBlock64: ; 7bb58 (1e:7b58) db $08,$20,$27,$00 db $00,$28,$26,$00 -FrameBlock65: ; 7bb71 (1e:7b71) +FrameBlock65: db $06 db $00,$00,$1c,$00 db $00,$08,$1d,$00 @@ -3341,27 +3341,27 @@ FrameBlock65: ; 7bb71 (1e:7b71) db $20,$00,$1c,$00 db $20,$08,$1d,$00 -FrameBlock66: ; 7bb8a (1e:7b8a) +FrameBlock66: db $02 db $00,$00,$03,$00 db $08,$00,$13,$00 -FrameBlock67: ; 7bb93 (1e:7b93) +FrameBlock67: db $01 db $00,$00,$03,$00 -FrameBlock68: ; 7bb98 (1e:7b98) +FrameBlock68: db $04 db $00,$00,$03,$00 db $00,$08,$03,$20 db $08,$00,$13,$00 db $08,$08,$13,$20 -FrameBlock69: ; 7bba9 (1e:7ba9) +FrameBlock69: db $01 db $00,$00,$06,$00 -FrameBlock6a: ; 7bbae (1e:7bae) +FrameBlock6a: db $08 db $00,$00,$2e,$00 db $00,$30,$2e,$20 @@ -3372,7 +3372,7 @@ FrameBlock6a: ; 7bbae (1e:7bae) db $18,$00,$3e,$00 db $18,$30,$3e,$20 -FrameBlock6b: ; 7bbcf (1e:7bcf) +FrameBlock6b: db $08 db $00,$00,$2e,$00 db $00,$20,$2e,$20 @@ -3383,7 +3383,7 @@ FrameBlock6b: ; 7bbcf (1e:7bcf) db $10,$00,$3e,$00 db $10,$20,$3e,$20 -FrameBlock6c: ; 7bbf0 (1e:7bf0) +FrameBlock6c: db $08 db $00,$00,$2e,$00 db $00,$10,$2e,$20 @@ -3394,33 +3394,33 @@ FrameBlock6c: ; 7bbf0 (1e:7bf0) db $08,$00,$3e,$00 db $08,$10,$3e,$20 -FrameBlock6d: ; 7bc11 (1e:7c11) +FrameBlock6d: db $02 db $00,$00,$1e,$00 db $00,$08,$1f,$00 -FrameBlock6e: ; 7bc1a (1e:7c1a) +FrameBlock6e: db $04 db $00,$00,$48,$00 db $00,$08,$48,$20 db $08,$00,$12,$00 db $08,$08,$12,$20 -FrameBlock6f: ; 7bc2b (1e:7c2b) +FrameBlock6f: db $04 db $00,$00,$4a,$00 db $00,$08,$07,$00 db $08,$00,$16,$00 db $08,$08,$17,$00 -FrameBlock70: ; 7bc3c (1e:7c3c) +FrameBlock70: db $04 db $00,$00,$07,$20 db $00,$08,$4a,$20 db $08,$00,$17,$20 db $08,$08,$16,$20 -FrameBlock76: ; 7bc4d (1e:7c4d) +FrameBlock76: db $07 db $00,$10,$2f,$00 db $01,$08,$2f,$00 @@ -3430,22 +3430,22 @@ FrameBlock76: ; 7bc4d (1e:7c4d) db $0a,$00,$3e,$00 db $0a,$20,$3e,$20 -FrameBlock77: ; 7bc6a (1e:7c6a) +FrameBlock77: db $04 db $00,$02,$4b,$00 db $00,$0a,$4c,$00 db $08,$00,$4c,$60 db $08,$08,$4b,$60 -FrameBlock78: ; 7bc7b (1e:7c7b) +FrameBlock78: db $01 db $00,$00,$4d,$00 -FrameBlock79: ; 7bc80 (1e:7c80) +FrameBlock79: db $01 db $00,$00,$4e,$00 -FrameBlockBaseCoords: ; 7bc85 (1e:7c85) +FrameBlockBaseCoords: db $10,$68 db $10,$70 db $10,$78 @@ -3624,5 +3624,5 @@ FrameBlockBaseCoords: ; 7bc85 (1e:7c85) db $1C,$48 db $48,$28 -FrameBlock00: ; 7bde7 (1e:7de7) +FrameBlock00: db $00,$00 diff --git a/data/bike_riding_tilesets.asm b/data/bike_riding_tilesets.asm index f0fc922d..48c2cee6 100755 --- a/data/bike_riding_tilesets.asm +++ b/data/bike_riding_tilesets.asm @@ -1,2 +1,2 @@ -BikeRidingTilesets:: ; 09e2 (0:09e2) +BikeRidingTilesets:: db OVERWORLD, FOREST, UNDERGROUND, SHIP_PORT, CAVERN, $FF diff --git a/data/credit_mons.asm b/data/credit_mons.asm index 6a8bb416..23142f9f 100755 --- a/data/credit_mons.asm +++ b/data/credit_mons.asm @@ -1,4 +1,4 @@ -CreditsMons: ; 74131 (1d:4131) +CreditsMons: db VENUSAUR db ARBOK db RHYHORN diff --git a/data/credits_order.asm b/data/credits_order.asm index 5a71a26a..20b9137f 100755 --- a/data/credits_order.asm +++ b/data/credits_order.asm @@ -1,4 +1,4 @@ -CreditsOrder: ; 74243 (1d:4243) +CreditsOrder: ; subsequent credits elements will be displayed on separate lines. ; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used ; to go to the next set of credits texts. diff --git a/data/cries.asm b/data/cries.asm index 7d03b831..7031536e 100755 --- a/data/cries.asm +++ b/data/cries.asm @@ -1,4 +1,4 @@ -CryData: ; 39446 (e:5446) +CryData: ;$BaseCry, $Pitch, $Length db $11, $00, $80; Rhydon db $03, $00, $80; Kangaskhan diff --git a/data/dungeon_tilesets.asm b/data/dungeon_tilesets.asm index 3501f2b9..01e86714 100755 --- a/data/dungeon_tilesets.asm +++ b/data/dungeon_tilesets.asm @@ -1,2 +1,2 @@ -DungeonTilesets: ; c7b2 (3:47b2) +DungeonTilesets: db FOREST, MUSEUM, SHIP, CAVERN, LOBBY, MANSION, GATE, LAB, FACILITY, CEMETERY, GYM, $FF diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 29a33479..a668ea3e 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,4 +1,4 @@ -EvosMovesPointerTable: ; 3b05c (e:705c) +EvosMovesPointerTable: dw Mon112_EvosMoves dw Mon115_EvosMoves dw Mon032_EvosMoves @@ -190,7 +190,7 @@ EvosMovesPointerTable: ; 3b05c (e:705c) dw Mon070_EvosMoves dw Mon071_EvosMoves -Mon112_EvosMoves: ; 3b1d8 (e:71d8) +Mon112_EvosMoves: ;RHYDON ;Evolutions db 0 @@ -203,7 +203,7 @@ Mon112_EvosMoves: ; 3b1d8 (e:71d8) db 64,TAKE_DOWN db 0 -Mon115_EvosMoves: ; 3b1e6 (e:71e6) +Mon115_EvosMoves: ;KANGASKHAN ;Evolutions db 0 @@ -215,7 +215,7 @@ Mon115_EvosMoves: ; 3b1e6 (e:71e6) db 46,DIZZY_PUNCH db 0 -Mon032_EvosMoves: ; 3b1f2 (e:71f2) +Mon032_EvosMoves: ;NIDORAN_M ;Evolutions db EV_LEVEL,16,NIDORINO @@ -229,7 +229,7 @@ Mon032_EvosMoves: ; 3b1f2 (e:71f2) db 43,DOUBLE_KICK db 0 -Mon035_EvosMoves: ; 3b203 (e:7203) +Mon035_EvosMoves: ;CLEFAIRY ;Evolutions db EV_ITEM,MOON_STONE,1,CLEFABLE @@ -243,7 +243,7 @@ Mon035_EvosMoves: ; 3b203 (e:7203) db 48,LIGHT_SCREEN db 0 -Mon021_EvosMoves: ; 3b215 (e:7215) +Mon021_EvosMoves: ;SPEAROW ;Evolutions db EV_LEVEL,20,FEAROW @@ -256,7 +256,7 @@ Mon021_EvosMoves: ; 3b215 (e:7215) db 36,AGILITY db 0 -Mon100_EvosMoves: ; 3b224 (e:7224) +Mon100_EvosMoves: ;VOLTORB ;Evolutions db EV_LEVEL,30,ELECTRODE @@ -269,7 +269,7 @@ Mon100_EvosMoves: ; 3b224 (e:7224) db 43,EXPLOSION db 0 -Mon034_EvosMoves: ; 3b233 (e:7233) +Mon034_EvosMoves: ;NIDOKING ;Evolutions db 0 @@ -279,7 +279,7 @@ Mon034_EvosMoves: ; 3b233 (e:7233) db 23,THRASH db 0 -Mon080_EvosMoves: ; 3b23b (e:723b) +Mon080_EvosMoves: ;SLOWBRO ;Evolutions db 0 @@ -293,7 +293,7 @@ Mon080_EvosMoves: ; 3b23b (e:723b) db 55,PSYCHIC_M db 0 -Mon002_EvosMoves: ; 3b24b (e:724b) +Mon002_EvosMoves: ;IVYSAUR ;Evolutions db EV_LEVEL,32,VENUSAUR @@ -308,7 +308,7 @@ Mon002_EvosMoves: ; 3b24b (e:724b) db 54,SOLARBEAM db 0 -Mon103_EvosMoves: ; 3b25e (e:725e) +Mon103_EvosMoves: ;EXEGGUTOR ;Evolutions db 0 @@ -316,7 +316,7 @@ Mon103_EvosMoves: ; 3b25e (e:725e) db 28,STOMP db 0 -Mon108_EvosMoves: ; 3b262 (e:7262) +Mon108_EvosMoves: ;LICKITUNG ;Evolutions db 0 @@ -328,7 +328,7 @@ Mon108_EvosMoves: ; 3b262 (e:7262) db 39,SCREECH db 0 -Mon102_EvosMoves: ; 3b26e (e:726e) +Mon102_EvosMoves: ;EXEGGCUTE ;Evolutions db EV_ITEM,LEAF_STONE,1,EXEGGUTOR @@ -342,7 +342,7 @@ Mon102_EvosMoves: ; 3b26e (e:726e) db 48,SLEEP_POWDER db 0 -Mon088_EvosMoves: ; 3b280 (e:7280) +Mon088_EvosMoves: ;GRIMER ;Evolutions db EV_LEVEL,38,MUK @@ -356,7 +356,7 @@ Mon088_EvosMoves: ; 3b280 (e:7280) db 55,ACID_ARMOR db 0 -Mon094_EvosMoves: ; 3b291 (e:7291) +Mon094_EvosMoves: ;GENGAR ;Evolutions db 0 @@ -365,7 +365,7 @@ Mon094_EvosMoves: ; 3b291 (e:7291) db 38,DREAM_EATER db 0 -Mon029_EvosMoves: ; 3b297 (e:7297) +Mon029_EvosMoves: ;NIDORAN_F ;Evolutions db EV_LEVEL,16,NIDORINA @@ -379,7 +379,7 @@ Mon029_EvosMoves: ; 3b297 (e:7297) db 43,DOUBLE_KICK db 0 -Mon031_EvosMoves: ; 3b2a8 (e:72a8) +Mon031_EvosMoves: ;NIDOQUEEN ;Evolutions db 0 @@ -389,7 +389,7 @@ Mon031_EvosMoves: ; 3b2a8 (e:72a8) db 23,BODY_SLAM db 0 -Mon104_EvosMoves: ; 3b2b0 (e:72b0) +Mon104_EvosMoves: ;CUBONE ;Evolutions db EV_LEVEL,28,MAROWAK @@ -402,7 +402,7 @@ Mon104_EvosMoves: ; 3b2b0 (e:72b0) db 46,RAGE db 0 -Mon111_EvosMoves: ; 3b2bf (e:72bf) +Mon111_EvosMoves: ;RHYHORN ;Evolutions db EV_LEVEL,42,RHYDON @@ -416,7 +416,7 @@ Mon111_EvosMoves: ; 3b2bf (e:72bf) db 55,TAKE_DOWN db 0 -Mon131_EvosMoves: ; 3b2d0 (e:72d0) +Mon131_EvosMoves: ;LAPRAS ;Evolutions db 0 @@ -429,14 +429,14 @@ Mon131_EvosMoves: ; 3b2d0 (e:72d0) db 46,HYDRO_PUMP db 0 -Mon059_EvosMoves: ; 3b2de (e:72de) +Mon059_EvosMoves: ;ARCANINE ;Evolutions db 0 ;Learnset db 0 -Mon151_EvosMoves: ; 3b2e0 (e:72e0) +Mon151_EvosMoves: ;MEW ;Evolutions db 0 @@ -447,7 +447,7 @@ Mon151_EvosMoves: ; 3b2e0 (e:72e0) db 40,PSYCHIC_M db 0 -Mon130_EvosMoves: ; 3b2ea (e:72ea) +Mon130_EvosMoves: ;GYARADOS ;Evolutions db 0 @@ -459,7 +459,7 @@ Mon130_EvosMoves: ; 3b2ea (e:72ea) db 52,HYPER_BEAM db 0 -Mon090_EvosMoves: ; 3b2f6 (e:72f6) +Mon090_EvosMoves: ;SHELLDER ;Evolutions db EV_ITEM,WATER_STONE,1,CLOYSTER @@ -472,7 +472,7 @@ Mon090_EvosMoves: ; 3b2f6 (e:72f6) db 50,ICE_BEAM db 0 -Mon072_EvosMoves: ; 3b306 (e:7306) +Mon072_EvosMoves: ;TENTACOOL ;Evolutions db EV_LEVEL,30,TENTACRUEL @@ -488,7 +488,7 @@ Mon072_EvosMoves: ; 3b306 (e:7306) db 48,HYDRO_PUMP db 0 -Mon092_EvosMoves: ; 3b31b (e:731b) +Mon092_EvosMoves: ;GASTLY ;Evolutions db EV_LEVEL,25,HAUNTER @@ -498,7 +498,7 @@ Mon092_EvosMoves: ; 3b31b (e:731b) db 35,DREAM_EATER db 0 -Mon123_EvosMoves: ; 3b324 (e:7324) +Mon123_EvosMoves: ;SCYTHER ;Evolutions db 0 @@ -511,7 +511,7 @@ Mon123_EvosMoves: ; 3b324 (e:7324) db 42,AGILITY db 0 -Mon120_EvosMoves: ; 3b332 (e:7332) +Mon120_EvosMoves: ;STARYU ;Evolutions db EV_ITEM,WATER_STONE,1,STARMIE @@ -526,7 +526,7 @@ Mon120_EvosMoves: ; 3b332 (e:7332) db 47,HYDRO_PUMP db 0 -Mon009_EvosMoves: ; 3b346 (e:7346) +Mon009_EvosMoves: ;BLASTOISE ;Evolutions db 0 @@ -539,7 +539,7 @@ Mon009_EvosMoves: ; 3b346 (e:7346) db 52,HYDRO_PUMP db 0 -Mon127_EvosMoves: ; 3b354 (e:7354) +Mon127_EvosMoves: ;PINSIR ;Evolutions db 0 @@ -552,7 +552,7 @@ Mon127_EvosMoves: ; 3b354 (e:7354) db 54,SWORDS_DANCE db 0 -Mon114_EvosMoves: ; 3b362 (e:7362) +Mon114_EvosMoves: ;TANGELA ;Evolutions db 0 @@ -565,21 +565,21 @@ Mon114_EvosMoves: ; 3b362 (e:7362) db 49,GROWTH db 0 -Mon152_EvosMoves: ; 3b370 (e:7370) +Mon152_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon153_EvosMoves: ; 3b372 (e:7372) +Mon153_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon058_EvosMoves: ; 3b374 (e:7374) +Mon058_EvosMoves: ;GROWLITHE ;Evolutions db EV_ITEM,FIRE_STONE,1,ARCANINE @@ -592,7 +592,7 @@ Mon058_EvosMoves: ; 3b374 (e:7374) db 50,FLAMETHROWER db 0 -Mon095_EvosMoves: ; 3b384 (e:7384) +Mon095_EvosMoves: ;ONIX ;Evolutions db 0 @@ -604,7 +604,7 @@ Mon095_EvosMoves: ; 3b384 (e:7384) db 43,HARDEN db 0 -Mon022_EvosMoves: ; 3b390 (e:7390) +Mon022_EvosMoves: ;FEAROW ;Evolutions db 0 @@ -616,7 +616,7 @@ Mon022_EvosMoves: ; 3b390 (e:7390) db 43,AGILITY db 0 -Mon016_EvosMoves: ; 3b39c (e:739c) +Mon016_EvosMoves: ;PIDGEY ;Evolutions db EV_LEVEL,18,PIDGEOTTO @@ -630,7 +630,7 @@ Mon016_EvosMoves: ; 3b39c (e:739c) db 44,MIRROR_MOVE db 0 -Mon079_EvosMoves: ; 3b3ad (e:73ad) +Mon079_EvosMoves: ;SLOWPOKE ;Evolutions db EV_LEVEL,37,SLOWBRO @@ -644,7 +644,7 @@ Mon079_EvosMoves: ; 3b3ad (e:73ad) db 48,PSYCHIC_M db 0 -Mon064_EvosMoves: ; 3b3be (e:73be) +Mon064_EvosMoves: ;KADABRA ;Evolutions db EV_TRADE,1,ALAKAZAM @@ -658,7 +658,7 @@ Mon064_EvosMoves: ; 3b3be (e:73be) db 42,REFLECT db 0 -Mon075_EvosMoves: ; 3b3cf (e:73cf) +Mon075_EvosMoves: ;GRAVELER ;Evolutions db EV_TRADE,1,GOLEM @@ -672,7 +672,7 @@ Mon075_EvosMoves: ; 3b3cf (e:73cf) db 43,EXPLOSION db 0 -Mon113_EvosMoves: ; 3b3e0 (e:73e0) +Mon113_EvosMoves: ;CHANSEY ;Evolutions db 0 @@ -685,7 +685,7 @@ Mon113_EvosMoves: ; 3b3e0 (e:73e0) db 54,DOUBLE_EDGE db 0 -Mon067_EvosMoves: ; 3b3ee (e:73ee) +Mon067_EvosMoves: ;MACHOKE ;Evolutions db EV_TRADE,1,MACHAMP @@ -698,7 +698,7 @@ Mon067_EvosMoves: ; 3b3ee (e:73ee) db 52,SUBMISSION db 0 -Mon122_EvosMoves: ; 3b3fd (e:73fd) +Mon122_EvosMoves: ;MR_MIME ;Evolutions db 0 @@ -710,7 +710,7 @@ Mon122_EvosMoves: ; 3b3fd (e:73fd) db 47,SUBSTITUTE db 0 -Mon106_EvosMoves: ; 3b409 (e:7409) +Mon106_EvosMoves: ;HITMONLEE ;Evolutions db 0 @@ -722,7 +722,7 @@ Mon106_EvosMoves: ; 3b409 (e:7409) db 53,MEGA_KICK db 0 -Mon107_EvosMoves: ; 3b415 (e:7415) +Mon107_EvosMoves: ;HITMONCHAN ;Evolutions db 0 @@ -734,7 +734,7 @@ Mon107_EvosMoves: ; 3b415 (e:7415) db 53,COUNTER db 0 -Mon024_EvosMoves: ; 3b421 (e:7421) +Mon024_EvosMoves: ;ARBOK ;Evolutions db 0 @@ -746,7 +746,7 @@ Mon024_EvosMoves: ; 3b421 (e:7421) db 47,ACID db 0 -Mon047_EvosMoves: ; 3b42d (e:742d) +Mon047_EvosMoves: ;PARASECT ;Evolutions db 0 @@ -758,7 +758,7 @@ Mon047_EvosMoves: ; 3b42d (e:742d) db 48,GROWTH db 0 -Mon054_EvosMoves: ; 3b439 (e:7439) +Mon054_EvosMoves: ;PSYDUCK ;Evolutions db EV_LEVEL,33,GOLDUCK @@ -771,7 +771,7 @@ Mon054_EvosMoves: ; 3b439 (e:7439) db 52,HYDRO_PUMP db 0 -Mon096_EvosMoves: ; 3b448 (e:7448) +Mon096_EvosMoves: ;DROWZEE ;Evolutions db EV_LEVEL,26,HYPNO @@ -785,7 +785,7 @@ Mon096_EvosMoves: ; 3b448 (e:7448) db 37,MEDITATE db 0 -Mon076_EvosMoves: ; 3b459 (e:7459) +Mon076_EvosMoves: ;GOLEM ;Evolutions db 0 @@ -798,14 +798,14 @@ Mon076_EvosMoves: ; 3b459 (e:7459) db 43,EXPLOSION db 0 -Mon154_EvosMoves: ; 3b467 (e:7467) +Mon154_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon126_EvosMoves: ; 3b469 (e:7469) +Mon126_EvosMoves: ;MAGMAR ;Evolutions db 0 @@ -818,14 +818,14 @@ Mon126_EvosMoves: ; 3b469 (e:7469) db 55,FLAMETHROWER db 0 -Mon155_EvosMoves: ; 3b477 (e:7477) +Mon155_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon125_EvosMoves: ; 3b479 (e:7479) +Mon125_EvosMoves: ;ELECTABUZZ ;Evolutions db 0 @@ -837,7 +837,7 @@ Mon125_EvosMoves: ; 3b479 (e:7479) db 54,THUNDER db 0 -Mon082_EvosMoves: ; 3b485 (e:7485) +Mon082_EvosMoves: ;MAGNETON ;Evolutions db 0 @@ -850,7 +850,7 @@ Mon082_EvosMoves: ; 3b485 (e:7485) db 54,SCREECH db 0 -Mon109_EvosMoves: ; 3b493 (e:7493) +Mon109_EvosMoves: ;KOFFING ;Evolutions db EV_LEVEL,35,WEEZING @@ -863,14 +863,14 @@ Mon109_EvosMoves: ; 3b493 (e:7493) db 48,EXPLOSION db 0 -Mon156_EvosMoves: ; 3b4a2 (e:74a2) +Mon156_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon056_EvosMoves: ; 3b4a4 (e:74a4) +Mon056_EvosMoves: ;MANKEY ;Evolutions db EV_LEVEL,28,PRIMEAPE @@ -883,7 +883,7 @@ Mon056_EvosMoves: ; 3b4a4 (e:74a4) db 39,THRASH db 0 -Mon086_EvosMoves: ; 3b4b3 (e:74b3) +Mon086_EvosMoves: ;SEEL ;Evolutions db EV_LEVEL,34,DEWGONG @@ -896,7 +896,7 @@ Mon086_EvosMoves: ; 3b4b3 (e:74b3) db 50,ICE_BEAM db 0 -Mon050_EvosMoves: ; 3b4c2 (e:74c2) +Mon050_EvosMoves: ;DIGLETT ;Evolutions db EV_LEVEL,26,DUGTRIO @@ -909,7 +909,7 @@ Mon050_EvosMoves: ; 3b4c2 (e:74c2) db 40,EARTHQUAKE db 0 -Mon128_EvosMoves: ; 3b4d1 (e:74d1) +Mon128_EvosMoves: ;TAUROS ;Evolutions db 0 @@ -921,28 +921,28 @@ Mon128_EvosMoves: ; 3b4d1 (e:74d1) db 51,TAKE_DOWN db 0 -Mon157_EvosMoves: ; 3b4dd (e:74dd) +Mon157_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon158_EvosMoves: ; 3b4df (e:74df) +Mon158_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon159_EvosMoves: ; 3b4e1 (e:74e1) +Mon159_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon083_EvosMoves: ; 3b4e3 (e:74e3) +Mon083_EvosMoves: ;FARFETCHD ;Evolutions db 0 @@ -954,7 +954,7 @@ Mon083_EvosMoves: ; 3b4e3 (e:74e3) db 39,SLASH db 0 -Mon048_EvosMoves: ; 3b4ef (e:74ef) +Mon048_EvosMoves: ;VENONAT ;Evolutions db EV_LEVEL,31,VENOMOTH @@ -968,7 +968,7 @@ Mon048_EvosMoves: ; 3b4ef (e:74ef) db 43,PSYCHIC_M db 0 -Mon149_EvosMoves: ; 3b500 (e:7500) +Mon149_EvosMoves: ;DRAGONITE ;Evolutions db 0 @@ -980,28 +980,28 @@ Mon149_EvosMoves: ; 3b500 (e:7500) db 60,HYPER_BEAM db 0 -Mon160_EvosMoves: ; 3b50c (e:750c) +Mon160_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon161_EvosMoves: ; 3b50e (e:750e) +Mon161_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon162_EvosMoves: ; 3b510 (e:7510) +Mon162_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon084_EvosMoves: ; 3b512 (e:7512) +Mon084_EvosMoves: ;DODUO ;Evolutions db EV_LEVEL,31,DODRIO @@ -1015,7 +1015,7 @@ Mon084_EvosMoves: ; 3b512 (e:7512) db 44,AGILITY db 0 -Mon060_EvosMoves: ; 3b523 (e:7523) +Mon060_EvosMoves: ;POLIWAG ;Evolutions db EV_LEVEL,25,POLIWHIRL @@ -1029,7 +1029,7 @@ Mon060_EvosMoves: ; 3b523 (e:7523) db 45,HYDRO_PUMP db 0 -Mon124_EvosMoves: ; 3b534 (e:7534) +Mon124_EvosMoves: ;JYNX ;Evolutions db 0 @@ -1042,7 +1042,7 @@ Mon124_EvosMoves: ; 3b534 (e:7534) db 58,BLIZZARD db 0 -Mon146_EvosMoves: ; 3b542 (e:7542) +Mon146_EvosMoves: ;MOLTRES ;Evolutions db 0 @@ -1052,7 +1052,7 @@ Mon146_EvosMoves: ; 3b542 (e:7542) db 60,SKY_ATTACK db 0 -Mon144_EvosMoves: ; 3b54a (e:754a) +Mon144_EvosMoves: ;ARTICUNO ;Evolutions db 0 @@ -1062,7 +1062,7 @@ Mon144_EvosMoves: ; 3b54a (e:754a) db 60,MIST db 0 -Mon145_EvosMoves: ; 3b552 (e:7552) +Mon145_EvosMoves: ;ZAPDOS ;Evolutions db 0 @@ -1072,14 +1072,14 @@ Mon145_EvosMoves: ; 3b552 (e:7552) db 60,LIGHT_SCREEN db 0 -Mon132_EvosMoves: ; 3b55a (e:755a) +Mon132_EvosMoves: ;DITTO ;Evolutions db 0 ;Learnset db 0 -Mon052_EvosMoves: ; 3b55c (e:755c) +Mon052_EvosMoves: ;MEOWTH ;Evolutions db EV_LEVEL,28,PERSIAN @@ -1092,7 +1092,7 @@ Mon052_EvosMoves: ; 3b55c (e:755c) db 44,SLASH db 0 -Mon098_EvosMoves: ; 3b56b (e:756b) +Mon098_EvosMoves: ;KRABBY ;Evolutions db EV_LEVEL,28,KINGLER @@ -1105,28 +1105,28 @@ Mon098_EvosMoves: ; 3b56b (e:756b) db 40,HARDEN db 0 -Mon163_EvosMoves: ; 3b57a (e:757a) +Mon163_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon164_EvosMoves: ; 3b57c (e:757c) +Mon164_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon165_EvosMoves: ; 3b57e (e:757e) +Mon165_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon037_EvosMoves: ; 3b580 (e:7580) +Mon037_EvosMoves: ;VULPIX ;Evolutions db EV_ITEM,FIRE_STONE,1,NINETALES @@ -1139,14 +1139,14 @@ Mon037_EvosMoves: ; 3b580 (e:7580) db 42,FIRE_SPIN db 0 -Mon038_EvosMoves: ; 3b590 (e:7590) +Mon038_EvosMoves: ;NINETALES ;Evolutions db 0 ;Learnset db 0 -Mon025_EvosMoves: ; 3b592 (e:7592) +Mon025_EvosMoves: ;PIKACHU ;Evolutions db EV_ITEM,THUNDER_STONE,1,RAICHU @@ -1159,28 +1159,28 @@ Mon025_EvosMoves: ; 3b592 (e:7592) db 43,THUNDER db 0 -Mon026_EvosMoves: ; 3b5a2 (e:75a2) +Mon026_EvosMoves: ;RAICHU ;Evolutions db 0 ;Learnset db 0 -Mon166_EvosMoves: ; 3b5a4 (e:75a4) +Mon166_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon167_EvosMoves: ; 3b5a6 (e:75a6) +Mon167_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon147_EvosMoves: ; 3b5a8 (e:75a8) +Mon147_EvosMoves: ;DRATINI ;Evolutions db EV_LEVEL,30,DRAGONAIR @@ -1193,7 +1193,7 @@ Mon147_EvosMoves: ; 3b5a8 (e:75a8) db 50,HYPER_BEAM db 0 -Mon148_EvosMoves: ; 3b5b7 (e:75b7) +Mon148_EvosMoves: ;DRAGONAIR ;Evolutions db EV_LEVEL,55,DRAGONITE @@ -1206,7 +1206,7 @@ Mon148_EvosMoves: ; 3b5b7 (e:75b7) db 55,HYPER_BEAM db 0 -Mon140_EvosMoves: ; 3b5c6 (e:75c6) +Mon140_EvosMoves: ;KABUTO ;Evolutions db EV_LEVEL,40,KABUTOPS @@ -1218,7 +1218,7 @@ Mon140_EvosMoves: ; 3b5c6 (e:75c6) db 49,HYDRO_PUMP db 0 -Mon141_EvosMoves: ; 3b5d3 (e:75d3) +Mon141_EvosMoves: ;KABUTOPS ;Evolutions db 0 @@ -1229,7 +1229,7 @@ Mon141_EvosMoves: ; 3b5d3 (e:75d3) db 53,HYDRO_PUMP db 0 -Mon116_EvosMoves: ; 3b5dd (e:75dd) +Mon116_EvosMoves: ;HORSEA ;Evolutions db EV_LEVEL,32,SEADRA @@ -1242,7 +1242,7 @@ Mon116_EvosMoves: ; 3b5dd (e:75dd) db 45,HYDRO_PUMP db 0 -Mon117_EvosMoves: ; 3b5ec (e:75ec) +Mon117_EvosMoves: ;SEADRA ;Evolutions db 0 @@ -1254,21 +1254,21 @@ Mon117_EvosMoves: ; 3b5ec (e:75ec) db 52,HYDRO_PUMP db 0 -Mon168_EvosMoves: ; 3b5f8 (e:75f8) +Mon168_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon169_EvosMoves: ; 3b5fa (e:75fa) +Mon169_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon027_EvosMoves: ; 3b5fc (e:75fc) +Mon027_EvosMoves: ;SANDSHREW ;Evolutions db EV_LEVEL,22,SANDSLASH @@ -1281,7 +1281,7 @@ Mon027_EvosMoves: ; 3b5fc (e:75fc) db 38,FURY_SWIPES db 0 -Mon028_EvosMoves: ; 3b60b (e:760b) +Mon028_EvosMoves: ;SANDSLASH ;Evolutions db 0 @@ -1293,7 +1293,7 @@ Mon028_EvosMoves: ; 3b60b (e:760b) db 47,FURY_SWIPES db 0 -Mon138_EvosMoves: ; 3b617 (e:7617) +Mon138_EvosMoves: ;OMANYTE ;Evolutions db EV_LEVEL,40,OMASTAR @@ -1305,7 +1305,7 @@ Mon138_EvosMoves: ; 3b617 (e:7617) db 53,HYDRO_PUMP db 0 -Mon139_EvosMoves: ; 3b624 (e:7624) +Mon139_EvosMoves: ;OMASTAR ;Evolutions db 0 @@ -1316,7 +1316,7 @@ Mon139_EvosMoves: ; 3b624 (e:7624) db 49,HYDRO_PUMP db 0 -Mon039_EvosMoves: ; 3b62e (e:762e) +Mon039_EvosMoves: ;JIGGLYPUFF ;Evolutions db EV_ITEM,MOON_STONE,1,WIGGLYTUFF @@ -1331,14 +1331,14 @@ Mon039_EvosMoves: ; 3b62e (e:762e) db 39,DOUBLE_EDGE db 0 -Mon040_EvosMoves: ; 3b642 (e:7642) +Mon040_EvosMoves: ;WIGGLYTUFF ;Evolutions db 0 ;Learnset db 0 -Mon133_EvosMoves: ; 3b644 (e:7644) +Mon133_EvosMoves: ;EEVEE ;Evolutions db EV_ITEM,FIRE_STONE,1,FLAREON @@ -1353,7 +1353,7 @@ Mon133_EvosEnd: db 45,TAKE_DOWN db 0 -Mon136_EvosMoves: ; 3b65a (e:765a) +Mon136_EvosMoves: ;FLAREON ;Evolutions db 0 @@ -1368,7 +1368,7 @@ Mon136_EvosMoves: ; 3b65a (e:765a) db 54,FLAMETHROWER db 0 -Mon135_EvosMoves: ; 3b66c (e:766c) +Mon135_EvosMoves: ;JOLTEON ;Evolutions db 0 @@ -1383,7 +1383,7 @@ Mon135_EvosMoves: ; 3b66c (e:766c) db 54,THUNDER db 0 -Mon134_EvosMoves: ; 3b67e (e:767e) +Mon134_EvosMoves: ;VAPOREON ;Evolutions db 0 @@ -1398,7 +1398,7 @@ Mon134_EvosMoves: ; 3b67e (e:767e) db 54,HYDRO_PUMP db 0 -Mon066_EvosMoves: ; 3b690 (e:7690) +Mon066_EvosMoves: ;MACHOP ;Evolutions db EV_LEVEL,28,MACHOKE @@ -1411,7 +1411,7 @@ Mon066_EvosMoves: ; 3b690 (e:7690) db 46,SUBMISSION db 0 -Mon041_EvosMoves: ; 3b69f (e:769f) +Mon041_EvosMoves: ;ZUBAT ;Evolutions db EV_LEVEL,22,GOLBAT @@ -1424,7 +1424,7 @@ Mon041_EvosMoves: ; 3b69f (e:769f) db 36,HAZE db 0 -Mon023_EvosMoves: ; 3b6ae (e:76ae) +Mon023_EvosMoves: ;EKANS ;Evolutions db EV_LEVEL,22,ARBOK @@ -1437,7 +1437,7 @@ Mon023_EvosMoves: ; 3b6ae (e:76ae) db 38,ACID db 0 -Mon046_EvosMoves: ; 3b6bd (e:76bd) +Mon046_EvosMoves: ;PARAS ;Evolutions db EV_LEVEL,24,PARASECT @@ -1450,7 +1450,7 @@ Mon046_EvosMoves: ; 3b6bd (e:76bd) db 41,GROWTH db 0 -Mon061_EvosMoves: ; 3b6cc (e:76cc) +Mon061_EvosMoves: ;POLIWHIRL ;Evolutions db EV_ITEM,WATER_STONE,1,POLIWRATH @@ -1464,7 +1464,7 @@ Mon061_EvosMoves: ; 3b6cc (e:76cc) db 49,HYDRO_PUMP db 0 -Mon062_EvosMoves: ; 3b6de (e:76de) +Mon062_EvosMoves: ;POLIWRATH ;Evolutions db 0 @@ -1473,7 +1473,7 @@ Mon062_EvosMoves: ; 3b6de (e:76de) db 19,WATER_GUN db 0 -Mon013_EvosMoves: ; 3b6e4 (e:76e4) +Mon013_EvosMoves: ;WEEDLE ;Evolutions db EV_LEVEL,7,KAKUNA @@ -1481,7 +1481,7 @@ Mon013_EvosMoves: ; 3b6e4 (e:76e4) ;Learnset db 0 -Mon014_EvosMoves: ; 3b6e9 (e:76e9) +Mon014_EvosMoves: ;KAKUNA ;Evolutions db EV_LEVEL,10,BEEDRILL @@ -1489,7 +1489,7 @@ Mon014_EvosMoves: ; 3b6e9 (e:76e9) ;Learnset db 0 -Mon015_EvosMoves: ; 3b6ee (e:76ee) +Mon015_EvosMoves: ;BEEDRILL ;Evolutions db 0 @@ -1502,14 +1502,14 @@ Mon015_EvosMoves: ; 3b6ee (e:76ee) db 35,AGILITY db 0 -Mon170_EvosMoves: ; 3b6fc (e:76fc) +Mon170_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon085_EvosMoves: ; 3b6fe (e:76fe) +Mon085_EvosMoves: ;DODRIO ;Evolutions db 0 @@ -1522,7 +1522,7 @@ Mon085_EvosMoves: ; 3b6fe (e:76fe) db 51,AGILITY db 0 -Mon057_EvosMoves: ; 3b70c (e:770c) +Mon057_EvosMoves: ;PRIMEAPE ;Evolutions db 0 @@ -1534,7 +1534,7 @@ Mon057_EvosMoves: ; 3b70c (e:770c) db 46,THRASH db 0 -Mon051_EvosMoves: ; 3b718 (e:7718) +Mon051_EvosMoves: ;DUGTRIO ;Evolutions db 0 @@ -1546,7 +1546,7 @@ Mon051_EvosMoves: ; 3b718 (e:7718) db 47,EARTHQUAKE db 0 -Mon049_EvosMoves: ; 3b724 (e:7724) +Mon049_EvosMoves: ;VENOMOTH ;Evolutions db 0 @@ -1559,7 +1559,7 @@ Mon049_EvosMoves: ; 3b724 (e:7724) db 50,PSYCHIC_M db 0 -Mon087_EvosMoves: ; 3b732 (e:7732) +Mon087_EvosMoves: ;DEWGONG ;Evolutions db 0 @@ -1571,21 +1571,21 @@ Mon087_EvosMoves: ; 3b732 (e:7732) db 56,ICE_BEAM db 0 -Mon171_EvosMoves: ; 3b73e (e:773e) +Mon171_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon172_EvosMoves: ; 3b740 (e:7740) +Mon172_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon010_EvosMoves: ; 3b742 (e:7742) +Mon010_EvosMoves: ;CATERPIE ;Evolutions db EV_LEVEL,7,METAPOD @@ -1593,7 +1593,7 @@ Mon010_EvosMoves: ; 3b742 (e:7742) ;Learnset db 0 -Mon011_EvosMoves: ; 3b747 (e:7747) +Mon011_EvosMoves: ;METAPOD ;Evolutions db EV_LEVEL,10,BUTTERFREE @@ -1601,7 +1601,7 @@ Mon011_EvosMoves: ; 3b747 (e:7747) ;Learnset db 0 -Mon012_EvosMoves: ; 3b74c (e:774c) +Mon012_EvosMoves: ;BUTTERFREE ;Evolutions db 0 @@ -1615,7 +1615,7 @@ Mon012_EvosMoves: ; 3b74c (e:774c) db 32,PSYBEAM db 0 -Mon068_EvosMoves: ; 3b75c (e:775c) +Mon068_EvosMoves: ;MACHAMP ;Evolutions db 0 @@ -1627,14 +1627,14 @@ Mon068_EvosMoves: ; 3b75c (e:775c) db 52,SUBMISSION db 0 -Mon173_EvosMoves: ; 3b768 (e:7768) +Mon173_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon055_EvosMoves: ; 3b76a (e:776a) +Mon055_EvosMoves: ;GOLDUCK ;Evolutions db 0 @@ -1646,7 +1646,7 @@ Mon055_EvosMoves: ; 3b76a (e:776a) db 59,HYDRO_PUMP db 0 -Mon097_EvosMoves: ; 3b776 (e:7776) +Mon097_EvosMoves: ;HYPNO ;Evolutions db 0 @@ -1659,7 +1659,7 @@ Mon097_EvosMoves: ; 3b776 (e:7776) db 43,MEDITATE db 0 -Mon042_EvosMoves: ; 3b784 (e:7784) +Mon042_EvosMoves: ;GOLBAT ;Evolutions db 0 @@ -1671,7 +1671,7 @@ Mon042_EvosMoves: ; 3b784 (e:7784) db 43,HAZE db 0 -Mon150_EvosMoves: ; 3b790 (e:7790) +Mon150_EvosMoves: ;MEWTWO ;Evolutions db 0 @@ -1683,7 +1683,7 @@ Mon150_EvosMoves: ; 3b790 (e:7790) db 81,AMNESIA db 0 -Mon143_EvosMoves: ; 3b79c (e:779c) +Mon143_EvosMoves: ;SNORLAX ;Evolutions db 0 @@ -1694,7 +1694,7 @@ Mon143_EvosMoves: ; 3b79c (e:779c) db 56,HYPER_BEAM db 0 -Mon129_EvosMoves: ; 3b7a6 (e:77a6) +Mon129_EvosMoves: ;MAGIKARP ;Evolutions db EV_LEVEL,20,GYARADOS @@ -1703,21 +1703,21 @@ Mon129_EvosMoves: ; 3b7a6 (e:77a6) db 15,TACKLE db 0 -Mon174_EvosMoves: ; 3b7ad (e:77ad) +Mon174_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon175_EvosMoves: ; 3b7af (e:77af) +Mon175_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon089_EvosMoves: ; 3b7b1 (e:77b1) +Mon089_EvosMoves: ;MUK ;Evolutions db 0 @@ -1730,14 +1730,14 @@ Mon089_EvosMoves: ; 3b7b1 (e:77b1) db 60,ACID_ARMOR db 0 -Mon176_EvosMoves: ; 3b7bf (e:77bf) +Mon176_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon099_EvosMoves: ; 3b7c1 (e:77c1) +Mon099_EvosMoves: ;KINGLER ;Evolutions db 0 @@ -1749,7 +1749,7 @@ Mon099_EvosMoves: ; 3b7c1 (e:77c1) db 49,HARDEN db 0 -Mon091_EvosMoves: ; 3b7cd (e:77cd) +Mon091_EvosMoves: ;CLOYSTER ;Evolutions db 0 @@ -1757,14 +1757,14 @@ Mon091_EvosMoves: ; 3b7cd (e:77cd) db 50,SPIKE_CANNON db 0 -Mon177_EvosMoves: ; 3b7d1 (e:77d1) +Mon177_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon101_EvosMoves: ; 3b7d3 (e:77d3) +Mon101_EvosMoves: ;ELECTRODE ;Evolutions db 0 @@ -1776,14 +1776,14 @@ Mon101_EvosMoves: ; 3b7d3 (e:77d3) db 50,EXPLOSION db 0 -Mon036_EvosMoves: ; 3b7df (e:77df) +Mon036_EvosMoves: ;CLEFABLE ;Evolutions db 0 ;Learnset db 0 -Mon110_EvosMoves: ; 3b7e1 (e:77e1) +Mon110_EvosMoves: ;WEEZING ;Evolutions db 0 @@ -1795,7 +1795,7 @@ Mon110_EvosMoves: ; 3b7e1 (e:77e1) db 53,EXPLOSION db 0 -Mon053_EvosMoves: ; 3b7ed (e:77ed) +Mon053_EvosMoves: ;PERSIAN ;Evolutions db 0 @@ -1807,7 +1807,7 @@ Mon053_EvosMoves: ; 3b7ed (e:77ed) db 51,SLASH db 0 -Mon105_EvosMoves: ; 3b7f9 (e:77f9) +Mon105_EvosMoves: ;MAROWAK ;Evolutions db 0 @@ -1819,14 +1819,14 @@ Mon105_EvosMoves: ; 3b7f9 (e:77f9) db 55,RAGE db 0 -Mon178_EvosMoves: ; 3b805 (e:7805) +Mon178_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon093_EvosMoves: ; 3b807 (e:7807) +Mon093_EvosMoves: ;HAUNTER ;Evolutions db EV_TRADE,1,GENGAR @@ -1836,7 +1836,7 @@ Mon093_EvosMoves: ; 3b807 (e:7807) db 38,DREAM_EATER db 0 -Mon063_EvosMoves: ; 3b810 (e:7810) +Mon063_EvosMoves: ;ABRA ;Evolutions db EV_LEVEL,16,KADABRA @@ -1844,7 +1844,7 @@ Mon063_EvosMoves: ; 3b810 (e:7810) ;Learnset db 0 -Mon065_EvosMoves: ; 3b815 (e:7815) +Mon065_EvosMoves: ;ALAKAZAM ;Evolutions db 0 @@ -1857,7 +1857,7 @@ Mon065_EvosMoves: ; 3b815 (e:7815) db 42,REFLECT db 0 -Mon017_EvosMoves: ; 3b823 (e:7823) +Mon017_EvosMoves: ;PIDGEOTTO ;Evolutions db EV_LEVEL,36,PIDGEOT @@ -1871,7 +1871,7 @@ Mon017_EvosMoves: ; 3b823 (e:7823) db 49,MIRROR_MOVE db 0 -Mon018_EvosMoves: ; 3b834 (e:7834) +Mon018_EvosMoves: ;PIDGEOT ;Evolutions db 0 @@ -1884,14 +1884,14 @@ Mon018_EvosMoves: ; 3b834 (e:7834) db 54,MIRROR_MOVE db 0 -Mon121_EvosMoves: ; 3b842 (e:7842) +Mon121_EvosMoves: ;STARMIE ;Evolutions db 0 ;Learnset db 0 -Mon001_EvosMoves: ; 3b844 (e:7844) +Mon001_EvosMoves: ;BULBASAUR ;Evolutions db EV_LEVEL,16,IVYSAUR @@ -1906,7 +1906,7 @@ Mon001_EvosMoves: ; 3b844 (e:7844) db 48,SOLARBEAM db 0 -Mon003_EvosMoves: ; 3b857 (e:7857) +Mon003_EvosMoves: ;VENUSAUR ;Evolutions db 0 @@ -1920,7 +1920,7 @@ Mon003_EvosMoves: ; 3b857 (e:7857) db 65,SOLARBEAM db 0 -Mon073_EvosMoves: ; 3b867 (e:7867) +Mon073_EvosMoves: ;TENTACRUEL ;Evolutions db 0 @@ -1935,14 +1935,14 @@ Mon073_EvosMoves: ; 3b867 (e:7867) db 50,HYDRO_PUMP db 0 -Mon179_EvosMoves: ; 3b879 (e:7879) +Mon179_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon118_EvosMoves: ; 3b87b (e:787b) +Mon118_EvosMoves: ;GOLDEEN ;Evolutions db EV_LEVEL,33,SEAKING @@ -1956,7 +1956,7 @@ Mon118_EvosMoves: ; 3b87b (e:787b) db 54,AGILITY db 0 -Mon119_EvosMoves: ; 3b88c (e:788c) +Mon119_EvosMoves: ;SEAKING ;Evolutions db 0 @@ -1969,35 +1969,35 @@ Mon119_EvosMoves: ; 3b88c (e:788c) db 54,AGILITY db 0 -Mon180_EvosMoves: ; 3b89a (e:789a) +Mon180_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon181_EvosMoves: ; 3b89c (e:789c) +Mon181_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon182_EvosMoves: ; 3b89e (e:789e) +Mon182_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon183_EvosMoves: ; 3b8a0 (e:78a0) +Mon183_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon077_EvosMoves: ; 3b8a2 (e:78a2) +Mon077_EvosMoves: ;PONYTA ;Evolutions db EV_LEVEL,40,RAPIDASH @@ -2011,7 +2011,7 @@ Mon077_EvosMoves: ; 3b8a2 (e:78a2) db 48,AGILITY db 0 -Mon078_EvosMoves: ; 3b8b3 (e:78b3) +Mon078_EvosMoves: ;RAPIDASH ;Evolutions db 0 @@ -2024,7 +2024,7 @@ Mon078_EvosMoves: ; 3b8b3 (e:78b3) db 55,AGILITY db 0 -Mon019_EvosMoves: ; 3b8c1 (e:78c1) +Mon019_EvosMoves: ;RATTATA ;Evolutions db EV_LEVEL,20,RATICATE @@ -2036,7 +2036,7 @@ Mon019_EvosMoves: ; 3b8c1 (e:78c1) db 34,SUPER_FANG db 0 -Mon020_EvosMoves: ; 3b8ce (e:78ce) +Mon020_EvosMoves: ;RATICATE ;Evolutions db 0 @@ -2047,7 +2047,7 @@ Mon020_EvosMoves: ; 3b8ce (e:78ce) db 41,SUPER_FANG db 0 -Mon033_EvosMoves: ; 3b8d8 (e:78d8) +Mon033_EvosMoves: ;NIDORINO ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOKING @@ -2061,7 +2061,7 @@ Mon033_EvosMoves: ; 3b8d8 (e:78d8) db 50,DOUBLE_KICK db 0 -Mon030_EvosMoves: ; 3b8ea (e:78ea) +Mon030_EvosMoves: ;NIDORINA ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOQUEEN @@ -2075,7 +2075,7 @@ Mon030_EvosMoves: ; 3b8ea (e:78ea) db 50,DOUBLE_KICK db 0 -Mon074_EvosMoves: ; 3b8fc (e:78fc) +Mon074_EvosMoves: ;GEODUDE ;Evolutions db EV_LEVEL,25,GRAVELER @@ -2089,7 +2089,7 @@ Mon074_EvosMoves: ; 3b8fc (e:78fc) db 36,EXPLOSION db 0 -Mon137_EvosMoves: ; 3b90d (e:790d) +Mon137_EvosMoves: ;PORYGON ;Evolutions db 0 @@ -2100,7 +2100,7 @@ Mon137_EvosMoves: ; 3b90d (e:790d) db 42,TRI_ATTACK db 0 -Mon142_EvosMoves: ; 3b917 (e:7917) +Mon142_EvosMoves: ;AERODACTYL ;Evolutions db 0 @@ -2111,14 +2111,14 @@ Mon142_EvosMoves: ; 3b917 (e:7917) db 54,HYPER_BEAM db 0 -Mon184_EvosMoves: ; 3b921 (e:7921) +Mon184_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon081_EvosMoves: ; 3b923 (e:7923) +Mon081_EvosMoves: ;MAGNEMITE ;Evolutions db EV_LEVEL,30,MAGNETON @@ -2132,21 +2132,21 @@ Mon081_EvosMoves: ; 3b923 (e:7923) db 47,SCREECH db 0 -Mon185_EvosMoves: ; 3b934 (e:7934) +Mon185_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon186_EvosMoves: ; 3b936 (e:7936) +Mon186_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon004_EvosMoves: ; 3b938 (e:7938) +Mon004_EvosMoves: ;CHARMANDER ;Evolutions db EV_LEVEL,16,CHARMELEON @@ -2160,7 +2160,7 @@ Mon004_EvosMoves: ; 3b938 (e:7938) db 46,FIRE_SPIN db 0 -Mon007_EvosMoves: ; 3b949 (e:7949) +Mon007_EvosMoves: ;SQUIRTLE ;Evolutions db EV_LEVEL,16,WARTORTLE @@ -2174,7 +2174,7 @@ Mon007_EvosMoves: ; 3b949 (e:7949) db 42,HYDRO_PUMP db 0 -Mon005_EvosMoves: ; 3b95a (e:795a) +Mon005_EvosMoves: ;CHARMELEON ;Evolutions db EV_LEVEL,36,CHARIZARD @@ -2188,7 +2188,7 @@ Mon005_EvosMoves: ; 3b95a (e:795a) db 56,FIRE_SPIN db 0 -Mon008_EvosMoves: ; 3b96b (e:796b) +Mon008_EvosMoves: ;WARTORTLE ;Evolutions db EV_LEVEL,36,BLASTOISE @@ -2202,7 +2202,7 @@ Mon008_EvosMoves: ; 3b96b (e:796b) db 47,HYDRO_PUMP db 0 -Mon006_EvosMoves: ; 3b97c (e:797c) +Mon006_EvosMoves: ;CHARIZARD ;Evolutions db 0 @@ -2215,35 +2215,35 @@ Mon006_EvosMoves: ; 3b97c (e:797c) db 55,FIRE_SPIN db 0 -Mon187_EvosMoves: ; 3b98a (e:798a) +Mon187_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon188_EvosMoves: ; 3b98c (e:798c) +Mon188_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon189_EvosMoves: ; 3b98e (e:798e) +Mon189_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon190_EvosMoves: ; 3b990 (e:7990) +Mon190_EvosMoves: ;MISSINGNO ;Evolutions db 0 ;Learnset db 0 -Mon043_EvosMoves: ; 3b992 (e:7992) +Mon043_EvosMoves: ;ODDISH ;Evolutions db EV_LEVEL,21,GLOOM @@ -2257,7 +2257,7 @@ Mon043_EvosMoves: ; 3b992 (e:7992) db 46,SOLARBEAM db 0 -Mon044_EvosMoves: ; 3b9a3 (e:79a3) +Mon044_EvosMoves: ;GLOOM ;Evolutions db EV_ITEM,LEAF_STONE,1,VILEPLUME @@ -2271,7 +2271,7 @@ Mon044_EvosMoves: ; 3b9a3 (e:79a3) db 52,SOLARBEAM db 0 -Mon045_EvosMoves: ; 3b9b5 (e:79b5) +Mon045_EvosMoves: ;VILEPLUME ;Evolutions db 0 @@ -2281,7 +2281,7 @@ Mon045_EvosMoves: ; 3b9b5 (e:79b5) db 19,SLEEP_POWDER db 0 -Mon069_EvosMoves: ; 3b9bd (e:79bd) +Mon069_EvosMoves: ;BELLSPROUT ;Evolutions db EV_LEVEL,21,WEEPINBELL @@ -2296,7 +2296,7 @@ Mon069_EvosMoves: ; 3b9bd (e:79bd) db 42,SLAM db 0 -Mon070_EvosMoves: ; 3b9d0 (e:79d0) +Mon070_EvosMoves: ;WEEPINBELL ;Evolutions db EV_ITEM,LEAF_STONE,1,VICTREEBEL @@ -2311,7 +2311,7 @@ Mon070_EvosMoves: ; 3b9d0 (e:79d0) db 49,SLAM db 0 -Mon071_EvosMoves: ; 3b9e4 (e:79e4) +Mon071_EvosMoves: ;VICTREEBEL ;Evolutions db 0 diff --git a/data/facing.asm b/data/facing.asm index 6906002e..c412247a 100644 --- a/data/facing.asm +++ b/data/facing.asm @@ -1,4 +1,4 @@ -SpriteFacingAndAnimationTable: ; 4000 (1:4000) +SpriteFacingAndAnimationTable: dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 0 dw SpriteFacingDownAndWalking, SpriteOAMParameters ; facing down, walk animation frame 1 dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 2 @@ -32,25 +32,25 @@ SpriteFacingAndAnimationTable: ; 4000 (1:4000) dw SpriteFacingDownAndStanding, SpriteOAMParameters dw SpriteFacingDownAndStanding, SpriteOAMParameters -SpriteFacingDownAndStanding: ; 4080 (1:4080) +SpriteFacingDownAndStanding: db $00,$01,$02,$03 -SpriteFacingDownAndWalking: ; 4084 (1:4084) +SpriteFacingDownAndWalking: db $80,$81,$82,$83 -SpriteFacingUpAndStanding: ; 4088 (1:4088) +SpriteFacingUpAndStanding: db $04,$05,$06,$07 -SpriteFacingUpAndWalking: ; 408c (1:408c) +SpriteFacingUpAndWalking: db $84,$85,$86,$87 -SpriteFacingLeftAndStanding: ; 4090 (1:4090) +SpriteFacingLeftAndStanding: db $08,$09,$0a,$0b -SpriteFacingLeftAndWalking: ; 4094 (1:4094) +SpriteFacingLeftAndWalking: db $88,$89,$8a,$8b -SpriteOAMParameters: ; 4098 (1:4098) +SpriteOAMParameters: db $00,$00, $00 ; top left db $00,$08, $00 ; top right db $08,$00, OAMFLAG_CANBEMASKED ; bottom left db $08,$08, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteOAMParametersFlipped: ; 40a4 (1:40a4) +SpriteOAMParametersFlipped: db $00,$08, OAMFLAG_VFLIPPED db $00,$00, OAMFLAG_VFLIPPED db $08,$08, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED diff --git a/data/force_bike_surf.asm b/data/force_bike_surf.asm index 66cae0a4..926db476 100755 --- a/data/force_bike_surf.asm +++ b/data/force_bike_surf.asm @@ -1,4 +1,4 @@ -ForcedBikeOrSurfMaps: ; c3e6 (3:43e6) +ForcedBikeOrSurfMaps: ; map id, y, x db ROUTE_16,$0A,$11 db ROUTE_16,$0B,$11 diff --git a/data/good_rod.asm b/data/good_rod.asm index f1785737..6c23f402 100755 --- a/data/good_rod.asm +++ b/data/good_rod.asm @@ -1,3 +1,3 @@ -GoodRodMons: ; e27f (3:627f) +GoodRodMons: db 10,GOLDEEN db 10,POLIWAG diff --git a/data/hidden_coins.asm b/data/hidden_coins.asm index e444bf28..b7358572 100755 --- a/data/hidden_coins.asm +++ b/data/hidden_coins.asm @@ -1,4 +1,4 @@ -HiddenCoinCoords: ; 76822 (1d:6822) +HiddenCoinCoords: db GAME_CORNER,$08,$00 db GAME_CORNER,$10,$01 db GAME_CORNER,$0b,$03 diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm index b2f9b3cc..96c4a07b 100755 --- a/data/hidden_item_coords.asm +++ b/data/hidden_item_coords.asm @@ -1,4 +1,4 @@ -HiddenItemCoords: ; 766b8 (1d:66b8) +HiddenItemCoords: ; map ID, then coords db VIRIDIAN_FOREST,$12,$01 db VIRIDIAN_FOREST,$2a,$10 diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index d7851779..43627bfc 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -1,4 +1,4 @@ -HiddenObjectMaps: ; 46a40 (11:6a40) +HiddenObjectMaps: db REDS_HOUSE_2F db BLUES_HOUSE db OAKS_LAB @@ -86,7 +86,7 @@ HiddenObjectMaps: ; 46a40 (11:6a40) db ROUTE_4 db $FF -HiddenObjectPointers: ; 46a96 (11:6a96) +HiddenObjectPointers: ; each of these pointers is for the corresponding map in HiddenObjectMaps dw RedsHouse2FHiddenObjects dw BluesHouseHiddenObjects @@ -175,7 +175,7 @@ HiddenObjectPointers: ; 46a96 (11:6a96) dw Route4HiddenObjects ; format: y-coord, x-coord, text id/item id, object routine -TradeCenterHiddenObjects: ; 46b40 (11:6b40) +TradeCenterHiddenObjects: db $04,$05,$d0 db BANK(CableClubRightGameboy) dw CableClubRightGameboy @@ -183,7 +183,7 @@ TradeCenterHiddenObjects: ; 46b40 (11:6b40) db BANK(CableClubLeftGameboy) dw CableClubLeftGameboy db $FF -ColosseumHiddenObjects: ; 46b4d (11:6b4d) +ColosseumHiddenObjects: db $04,$05,$d0 db BANK(CableClubRightGameboy) dw CableClubRightGameboy @@ -191,13 +191,13 @@ ColosseumHiddenObjects: ; 46b4d (11:6b4d) db BANK(CableClubLeftGameboy) dw CableClubLeftGameboy db $FF -RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a) +RedsHouse2FHiddenObjects: db $01,$00,$04 dbw BANK(OpenRedsPC), OpenRedsPC db $05,$03,$d0 dbw BANK(PrintRedSNESText), PrintRedSNESText db $FF -BluesHouseHiddenObjects: ; 46b67 (11:6b67) +BluesHouseHiddenObjects: db $01,$00,$04 db BANK(PrintBookcaseText) dw PrintBookcaseText @@ -208,7 +208,7 @@ BluesHouseHiddenObjects: ; 46b67 (11:6b67) db BANK(PrintBookcaseText) dw PrintBookcaseText db $FF -OaksLabHiddenObjects: ; 46b7a (11:6b7a) +OaksLabHiddenObjects: db $00,$04,$04 db BANK(DisplayOakLabLeftPoster) dw DisplayOakLabLeftPoster @@ -222,7 +222,7 @@ OaksLabHiddenObjects: ; 46b7a (11:6b7a) db BANK(DisplayOakLabEmailText) dw DisplayOakLabEmailText db $FF -ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93) +ViridianPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -230,9 +230,9 @@ ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -ViridianMartHiddenObjects: ; 46ba0 (11:6ba0) +ViridianMartHiddenObjects: db $FF -ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1) +ViridianSchoolHiddenObjects: db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1 db Bank(PrintNotebookText) dw PrintNotebookText @@ -240,27 +240,27 @@ ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1) db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText db $FF -ViridianGymHiddenObjects: ; 46bae (11:6bae) +ViridianGymHiddenObjects: db $0f,$0f,$04 dbw BANK(GymStatues),GymStatues db $0f,$12,$04 dbw BANK(GymStatues),GymStatues db $FF -Museum1FHiddenObjects: ; 46bbb (11:6bbb) +Museum1FHiddenObjects: db $03,$02,$04 dbw BANK(AerodactylFossil), AerodactylFossil db $06,$02,$04 dbw BANK(KabutopsFossil), KabutopsFossil db $FF -PewterGymHiddenObjects: ; 46bc8 (11:6bc8) +PewterGymHiddenObjects: db $0a,$03,$04 dbw BANK(GymStatues),GymStatues db $0a,$06,$04 dbw BANK(GymStatues),GymStatues db $FF -PewterMartHiddenObjects: ; 46bd5 (11:6bd5) +PewterMartHiddenObjects: db $FF -PewterPokecenterHiddenObjects: ; 46bd6 (11:6bd6) +PewterPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -268,7 +268,7 @@ PewterPokecenterHiddenObjects: ; 46bd6 (11:6bd6) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CeruleanPokecenterHiddenObjects: ; 46be3 (11:6be3) +CeruleanPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -276,15 +276,15 @@ CeruleanPokecenterHiddenObjects: ; 46be3 (11:6be3) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CeruleanGymHiddenObjects: ; 46bf0 (11:6bf0) +CeruleanGymHiddenObjects: db $0b,$03,$04 dbw BANK(GymStatues),GymStatues db $0b,$06,$04 dbw BANK(GymStatues),GymStatues db $FF -CeruleanMartHiddenObjects: ; 46bfd (11:6bfd) +CeruleanMartHiddenObjects: db $FF -LavenderPokecenterHiddenObjects: ; 46bfe (11:6bfe) +LavenderPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -292,7 +292,7 @@ LavenderPokecenterHiddenObjects: ; 46bfe (11:6bfe) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -VermilionPokecenterHiddenObjects: ; 46c0b (11:6c0b) +VermilionPokecenterHiddenObjects: db $03,$0d,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC @@ -300,7 +300,7 @@ VermilionPokecenterHiddenObjects: ; 46c0b (11:6c0b) db Bank(PrintBenchGuyText) dw PrintBenchGuyText db $FF -VermilionGymHiddenObjects: ; 46c18 (11:6c18) +VermilionGymHiddenObjects: db $0e,$03,$04 dbw BANK(GymStatues), GymStatues db $0e,$06,$04 @@ -338,12 +338,12 @@ VermilionGymHiddenObjects: ; 46c18 (11:6c18) db $0b,$09,$0e dbw BANK(GymTrashScript), GymTrashScript db $FF -CeladonMansion2HiddenObjects: ; 46c85 (11:6c85) +CeladonMansion2HiddenObjects: db $05,$00,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CeladonPokecenterHiddenObjects: ; 46c8c (11:6c8c) +CeladonPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -351,13 +351,13 @@ CeladonPokecenterHiddenObjects: ; 46c8c (11:6c8c) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CeladonGymHiddenObjects: ; 46c99 (11:6c99) +CeladonGymHiddenObjects: db $0f,$03,$04 dbw BANK(GymStatues),GymStatues db $0f,$06,$04 dbw BANK(GymStatues),GymStatues db $FF -GameCornerHiddenObjects: ; 46ca6 (11:6ca6) +GameCornerHiddenObjects: db $0f,$12,$d0 dbw BANK(StartSlotMachine), StartSlotMachine db $0e,$12,$d0 @@ -455,7 +455,7 @@ GameCornerHiddenObjects: ; 46ca6 (11:6ca6) db $0f,$0c,COIN+10 dbw BANK(HiddenCoins),HiddenCoins db $FF -CeladonHotelHiddenObjects: ; 46dc7 (11:6dc7) +CeladonHotelHiddenObjects: db $03,$0d,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC @@ -463,7 +463,7 @@ CeladonHotelHiddenObjects: ; 46dc7 (11:6dc7) db Bank(PrintBenchGuyText) dw PrintBenchGuyText db $FF -FuchsiaPokecenterHiddenObjects: ; 46dd4 (11:6dd4) +FuchsiaPokecenterHiddenObjects: db $03,$0d,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC @@ -471,13 +471,13 @@ FuchsiaPokecenterHiddenObjects: ; 46dd4 (11:6dd4) db Bank(PrintBenchGuyText) dw PrintBenchGuyText db $FF -FuchsiaGymHiddenObjects: ; 46de1 (11:6de1) +FuchsiaGymHiddenObjects: db $0f,$03,$04 dbw BANK(GymStatues),GymStatues db $0f,$06,$04 dbw BANK(GymStatues),GymStatues db $FF -CinnabarGymHiddenObjects: ; 46dee (11:6dee) +CinnabarGymHiddenObjects: db $0d,$11,$04 dbw BANK(GymStatues),GymStatues db $07,$0f,$01 @@ -499,7 +499,7 @@ CinnabarGymHiddenObjects: ; 46dee (11:6dee) db Bank(PrintCinnabarQuiz) dw PrintCinnabarQuiz db $FF -CinnabarPokecenterHiddenObjects: ; 46e19 (11:6e19) +CinnabarPokecenterHiddenObjects: db $04,$00,$04 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -507,11 +507,11 @@ CinnabarPokecenterHiddenObjects: ; 46e19 (11:6e19) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -SaffronGymHiddenObjects: ; 46e26 (11:6e26) +SaffronGymHiddenObjects: db $0f,$09,$04 dbw BANK(GymStatues),GymStatues db $FF -MtMoonPokecenterHiddenObjects: ; 46e2d (11:6e2d) +MtMoonPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -519,7 +519,7 @@ MtMoonPokecenterHiddenObjects: ; 46e2d (11:6e2d) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -RockTunnelPokecenterHiddenObjects: ; 46e3a (11:6e3a) +RockTunnelPokecenterHiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -527,19 +527,19 @@ RockTunnelPokecenterHiddenObjects: ; 46e3a (11:6e3a) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -ViridianForestHiddenObjects: ; 46e47 (11:6e47) +ViridianForestHiddenObjects: db $12,$01,POTION dbw BANK(HiddenItems),HiddenItems db $2a,$10,ANTIDOTE dbw BANK(HiddenItems),HiddenItems db $FF -MtMoon3HiddenObjects: ; 46e54 (11:6e54) +MtMoon3HiddenObjects: db $0c,$12,MOON_STONE dbw BANK(HiddenItems),HiddenItems db $09,$21,ETHER dbw BANK(HiddenItems),HiddenItems db $FF -IndigoPlateauHiddenObjects: ; 46e61 (11:6e61) +IndigoPlateauHiddenObjects: db $0d,$08,$ff db BANK(PrintIndigoPlateauHQText) dw PrintIndigoPlateauHQText @@ -547,17 +547,17 @@ IndigoPlateauHiddenObjects: ; 46e61 (11:6e61) db BANK(PrintIndigoPlateauHQText) dw PrintIndigoPlateauHQText db $FF -Route25HiddenObjects: ; 46e6e (11:6e6e) +Route25HiddenObjects: db $03,$26,ETHER dbw BANK(HiddenItems),HiddenItems db $01,$0a,ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -Route9HiddenObjects: ; 46e7b (11:6e7b) +Route9HiddenObjects: db $07,$0e,ETHER dbw BANK(HiddenItems),HiddenItems db $FF -SSAnne6HiddenObjects: ; 46e82 (11:6e82) +SSAnne6HiddenObjects: db $05,$0d,$00 dbw BANK(PrintTrashText), PrintTrashText db $07,$0d,$00 @@ -565,29 +565,29 @@ SSAnne6HiddenObjects: ; 46e82 (11:6e82) db $09,$0d,GREAT_BALL dbw BANK(HiddenItems),HiddenItems db $FF -SSAnne10HiddenObjects: ; 46e95 (11:6e95) +SSAnne10HiddenObjects: db $01,$03,HYPER_POTION dbw BANK(HiddenItems),HiddenItems db $FF -Route10HiddenObjects: ; 46e9c (11:6e9c) +Route10HiddenObjects: db $11,$09,SUPER_POTION dbw BANK(HiddenItems),HiddenItems db $35,$10,MAX_ETHER dbw BANK(HiddenItems),HiddenItems db $FF -RocketHideout1HiddenObjects: ; 46ea9 (11:6ea9) +RocketHideout1HiddenObjects: db $0f,$15,PP_UP dbw BANK(HiddenItems),HiddenItems db $FF -RocketHideout3HiddenObjects: ; 46eb0 (11:6eb0) +RocketHideout3HiddenObjects: db $11,$1b,NUGGET dbw BANK(HiddenItems),HiddenItems db $FF -RocketHideout4HiddenObjects: ; 46eb7 (11:6eb7) +RocketHideout4HiddenObjects: db $01,$19,SUPER_POTION dbw BANK(HiddenItems),HiddenItems db $FF -SaffronPokecenterHiddenObjects: ; 46ebe (11:6ebe) +SaffronPokecenterHiddenObjects: db $04,$00,$04 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -595,78 +595,78 @@ SaffronPokecenterHiddenObjects: ; 46ebe (11:6ebe) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -PokemonTower5HiddenObjects: ; 46ecb (11:6ecb) +PokemonTower5HiddenObjects: db $0c,$04,ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -Route13HiddenObjects: ; 46ed2 (11:6ed2) +Route13HiddenObjects: db $0e,$01,PP_UP dbw BANK(HiddenItems),HiddenItems db $0d,$10,CALCIUM dbw BANK(HiddenItems),HiddenItems db $FF -SafariZoneEntranceHiddenObjects: ; 46edf (11:6edf) +SafariZoneEntranceHiddenObjects: db $01,$0a,NUGGET dbw BANK(HiddenItems),HiddenItems db $FF -SafariZoneWestHiddenObjects: ; 46ee6 (11:6ee6) +SafariZoneWestHiddenObjects: db $05,$06,REVIVE dbw BANK(HiddenItems),HiddenItems db $FF -SilphCo5FHiddenObjects: ; 46eed (11:6eed) +SilphCo5FHiddenObjects: db $03,$0c,ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -SilphCo9FHiddenObjects: ; 46ef4 (11:6ef4) +SilphCo9FHiddenObjects: db $0f,$02,MAX_POTION dbw BANK(HiddenItems),HiddenItems db $FF -CopycatsHouse2FHiddenObjects: ; 46efb (11:6efb) +CopycatsHouse2FHiddenObjects: db $01,$01,NUGGET dbw BANK(HiddenItems),HiddenItems db $FF -UnknownDungeon1HiddenObjects: ; 46f02 (11:6f02) +UnknownDungeon1HiddenObjects: db $0b,$0e,RARE_CANDY dbw BANK(HiddenItems),HiddenItems db $FF -UnknownDungeon3HiddenObjects: ; 46f09 (11:6f09) +UnknownDungeon3HiddenObjects: db $03,$1b,ULTRA_BALL dbw BANK(HiddenItems),HiddenItems db $FF -PowerPlantHiddenObjects: ; 46f10 (11:6f10) +PowerPlantHiddenObjects: db $10,$11,MAX_ELIXER dbw BANK(HiddenItems),HiddenItems db $01,$0c,PP_UP dbw BANK(HiddenItems),HiddenItems db $FF -SeafoamIslands3HiddenObjects: ; 46f1d (11:6f1d) +SeafoamIslands3HiddenObjects: db $0f,$0f,NUGGET dbw BANK(HiddenItems),HiddenItems db $FF -SeafoamIslands5HiddenObjects: ; 46f24 (11:6f24) +SeafoamIslands5HiddenObjects: db $11,$19,ULTRA_BALL dbw BANK(HiddenItems),HiddenItems db $FF -Mansion1HiddenObjects: ; 46f2b (11:6f2b) +Mansion1HiddenObjects: db $10,$08,MOON_STONE dbw BANK(HiddenItems),HiddenItems db $05,$02,$04 db BANK(Mansion1Script_Switches) dw Mansion1Script_Switches db $FF -Mansion2HiddenObjects: ; 46f38 (11:6f38) +Mansion2HiddenObjects: db $0b,$02,$04 db BANK(Mansion2Script_Switches) dw Mansion2Script_Switches db $FF -Mansion3HiddenObjects: ; 46f3f (11:6f3f) +Mansion3HiddenObjects: db $09,$01,MAX_REVIVE dbw BANK(HiddenItems),HiddenItems db $05,$0a,$04 db BANK(Mansion3Script_Switches) dw Mansion3Script_Switches db $FF -Mansion4HiddenObjects: ; 46f4c (11:6f4c) +Mansion4HiddenObjects: db $09,$01,RARE_CANDY dbw BANK(HiddenItems),HiddenItems db $03,$14,$04 @@ -676,7 +676,7 @@ Mansion4HiddenObjects: ; 46f4c (11:6f4c) db BANK(Mansion4Script_Switches) dw Mansion4Script_Switches db $FF -Route23HiddenObjects: ; 46f5f (11:6f5f) +Route23HiddenObjects: db $2c,$09,FULL_RESTORE dbw BANK(HiddenItems),HiddenItems db $46,$13,ULTRA_BALL @@ -684,25 +684,25 @@ Route23HiddenObjects: ; 46f5f (11:6f5f) db $5a,$08,MAX_ETHER dbw BANK(HiddenItems),HiddenItems db $FF -VictoryRoad2HiddenObjects: ; 46f72 (11:6f72) +VictoryRoad2HiddenObjects: db $02,$05,ULTRA_BALL dbw BANK(HiddenItems),HiddenItems db $07,$1a,FULL_RESTORE dbw BANK(HiddenItems),HiddenItems db $FF -Unused6FHiddenObjects: ; 46f7f (11:6f7f) +Unused6FHiddenObjects: db $0b,$0e,MAX_ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -BillsHouseHiddenObjects: ; 46f86 (11:6f86) +BillsHouseHiddenObjects: db $04,$01,$04 dbw BANK(BillsHousePC), BillsHousePC db $FF -ViridianCityHiddenObjects: ; 46f8d (11:6f8d) +ViridianCityHiddenObjects: db $04,$0e,POTION dbw BANK(HiddenItems),HiddenItems db $FF -SafariZoneRestHouse2HiddenObjects: ; 46f94 (11:6f94) +SafariZoneRestHouse2HiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -710,7 +710,7 @@ SafariZoneRestHouse2HiddenObjects: ; 46f94 (11:6f94) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -SafariZoneRestHouse3HiddenObjects: ; 46fa1 (11:6fa1) +SafariZoneRestHouse3HiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -718,7 +718,7 @@ SafariZoneRestHouse3HiddenObjects: ; 46fa1 (11:6fa1) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -SafariZoneRestHouse4HiddenObjects: ; 46fae (11:6fae) +SafariZoneRestHouse4HiddenObjects: db $04,$00,$08 db Bank(PrintBenchGuyText) dw PrintBenchGuyText @@ -726,12 +726,12 @@ SafariZoneRestHouse4HiddenObjects: ; 46fae (11:6fae) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -Route15GateUpstairsHiddenObjects: ; 46fbb (11:6fbb) +Route15GateUpstairsHiddenObjects: db $02,$01,$04 db BANK(Route15GateLeftBinoculars) dw Route15GateLeftBinoculars db $FF -LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2) +LavenderHouse1HiddenObjects: db $01,$00,$00 db BANK(PrintMagazinesText) dw PrintMagazinesText @@ -742,7 +742,7 @@ LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2) db BANK(PrintMagazinesText) dw PrintMagazinesText db $FF -CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5) +CeladonMansion5HiddenObjects: db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1 db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText @@ -753,7 +753,7 @@ CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5) db Bank(PrintNotebookText) dw PrintNotebookText db $FF -FightingDojoHiddenObjects: ; 46fe8 (11:6fe8) +FightingDojoHiddenObjects: db $09,$03,$04 db BANK(PrintFightingDojoText) dw PrintFightingDojoText @@ -767,12 +767,12 @@ FightingDojoHiddenObjects: ; 46fe8 (11:6fe8) db BANK(PrintFightingDojoText3) dw PrintFightingDojoText3 db $FF -IndigoPlateauLobbyHiddenObjects: ; 47001 (11:7001) +IndigoPlateauLobbyHiddenObjects: db $07,$0f,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -CinnabarLab4HiddenObjects: ; 47008 (11:7008) +CinnabarLab4HiddenObjects: db $04,$00,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC @@ -780,7 +780,7 @@ CinnabarLab4HiddenObjects: ; 47008 (11:7008) db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -BikeShopHiddenObjects: ; 47015 (11:7015) +BikeShopHiddenObjects: db $00,$01,$d0 dbw BANK(PrintNewBikeText), PrintNewBikeText db $01,$02,$d0 @@ -794,20 +794,20 @@ BikeShopHiddenObjects: ; 47015 (11:7015) db $05,$01,$d0 dbw BANK(PrintNewBikeText), PrintNewBikeText db $FF -Route11HiddenObjects: ; 4703a (11:703a) +Route11HiddenObjects: db $05,$30,ESCAPE_ROPE dbw BANK(HiddenItems),HiddenItems db $FF -Route12HiddenObjects: ; 47041 (11:7041) +Route12HiddenObjects: db $3f,$02,HYPER_POTION dbw BANK(HiddenItems),HiddenItems db $FF -SilphCo11FHiddenObjects: ; 47048 (11:7048) +SilphCo11FHiddenObjects: db $0c,$0a,$04 db BANK(OpenPokemonCenterPC) dw OpenPokemonCenterPC db $FF -Route17HiddenObjects: ; 4704f (11:704f) +Route17HiddenObjects: db $0e,$0f,RARE_CANDY dbw BANK(HiddenItems),HiddenItems db $2d,$08,FULL_RESTORE @@ -819,35 +819,35 @@ Route17HiddenObjects: ; 4704f (11:704f) db $79,$08,MAX_ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -UndergroundPathNsHiddenObjects: ; 4706e (11:706e) +UndergroundPathNsHiddenObjects: db $04,$03,FULL_RESTORE dbw BANK(HiddenItems),HiddenItems db $22,$04,X_SPECIAL dbw BANK(HiddenItems),HiddenItems db $FF -UndergroundPathWeHiddenObjects: ; 4707b (11:707b) +UndergroundPathWeHiddenObjects: db $02,$0c,NUGGET dbw BANK(HiddenItems),HiddenItems db $05,$15,ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -CeladonCityHiddenObjects: ; 47088 (11:7088) +CeladonCityHiddenObjects: db $0f,$30,PP_UP dbw BANK(HiddenItems),HiddenItems db $FF -SeafoamIslands4HiddenObjects: ; 4708f (11:708f) +SeafoamIslands4HiddenObjects: db $10,$09,MAX_ELIXER dbw BANK(HiddenItems),HiddenItems db $FF -VermilionCityHiddenObjects: ; 47096 (11:7096) +VermilionCityHiddenObjects: db $0b,$0e,MAX_ETHER dbw BANK(HiddenItems),HiddenItems db $FF -CeruleanCityHiddenObjects: ; 4709d (11:709d) +CeruleanCityHiddenObjects: db $08,$0f,RARE_CANDY dbw BANK(HiddenItems),HiddenItems db $FF -Route4HiddenObjects: ; 470a4 (11:70a4) +Route4HiddenObjects: db $03,$28,GREAT_BALL dbw BANK(HiddenItems),HiddenItems db $FF diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 4fe57b20..f3ea62ef 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -4,7 +4,7 @@ ; Table of 2-Byte pointers, one pointer per map, ; goes up to Map_F7, ends with $FFFF. ; points to table listing all missable object in the area -MapHSPointers: ; c8f5 (3:48f5) +MapHSPointers: dw MapHS00 dw MapHS01 dw MapHS02 @@ -269,23 +269,23 @@ MapHSPointers: ; c8f5 (3:48f5) Hide equ $11 Show equ $15 -MapHSXX: ; cae7 (3:4ae7) +MapHSXX: db $FF,$FF,$FF -MapHS00: ; caea (3:4aea) +MapHS00: db PALLET_TOWN,$01,Hide -MapHS01: ; caed (3:4aed) +MapHS01: db VIRIDIAN_CITY,$05,Show db VIRIDIAN_CITY,$07,Hide -MapHS02: ; caf3 (3:4af3) +MapHS02: db PEWTER_CITY,$03,Show db PEWTER_CITY,$05,Show -MapHS03: ; caf9 (3:4af9) +MapHS03: db CERULEAN_CITY,$01,Hide db CERULEAN_CITY,$02,Show db CERULEAN_CITY,$06,Hide db CERULEAN_CITY,$0A,Show db CERULEAN_CITY,$0B,Show -MapHS0A: ; cb08 (3:4b08) +MapHS0A: db SAFFRON_CITY,$01,Show db SAFFRON_CITY,$02,Show db SAFFRON_CITY,$03,Show @@ -301,34 +301,34 @@ MapHS0A: ; cb08 (3:4b08) db SAFFRON_CITY,$0D,Hide db SAFFRON_CITY,$0E,Show db SAFFRON_CITY,$0F,Hide -MapHS0D: ; cb35 (3:4b35) +MapHS0D: db ROUTE_2,$01,Show db ROUTE_2,$02,Show -MapHS0F: ; cb3b (3:4b3b) +MapHS0F: db ROUTE_4,$03,Show -MapHS14: ; cb3e (3:4b3e) +MapHS14: db ROUTE_9,$0A,Show -MapHS17: ; cb41 (3:4b41) +MapHS17: db ROUTE_12,$01,Show db ROUTE_12,$09,Show db ROUTE_12,$0A,Show -MapHS1A: ; cb4a (3:4b4a) +MapHS1A: db ROUTE_15,$0B,Show -MapHS1B: ; cb4d (3:4b4d) +MapHS1B: db ROUTE_16,$07,Show -MapHS21: ; cb50 (3:4b50) +MapHS21: db ROUTE_22,$01,Hide db ROUTE_22,$02,Hide -MapHS23: ; cb56 (3:4b56) +MapHS23: db ROUTE_24,$01,Show db ROUTE_24,$08,Show -MapHS24: ; cb5c (3:4b5c) +MapHS24: db ROUTE_25,$0A,Show -MapHS27: ; cb5f (3:4b5f) +MapHS27: db BLUES_HOUSE,$01,Show db BLUES_HOUSE,$02,Hide db BLUES_HOUSE,$03,Show -MapHS28: ; cb68 (3:4b68) +MapHS28: db OAKS_LAB,$01,Show db OAKS_LAB,$02,Show db OAKS_LAB,$03,Show @@ -337,50 +337,50 @@ MapHS28: ; cb68 (3:4b68) db OAKS_LAB,$06,Show db OAKS_LAB,$07,Show db OAKS_LAB,$08,Hide -MapHS2D: ; cb80 (3:4b80) +MapHS2D: db VIRIDIAN_GYM,$01,Show db VIRIDIAN_GYM,$0B,Show -MapHS34: ; cb86 (3:4b86) +MapHS34: db MUSEUM_1F,$05,Show -MapHSE4: ; cb89 (3:4b89) +MapHSE4: db UNKNOWN_DUNGEON_1,$01,Show db UNKNOWN_DUNGEON_1,$02,Show db UNKNOWN_DUNGEON_1,$03,Show -MapHS8F: ; cb92 (3:4b92) +MapHS8F: db POKEMONTOWER_2,$01,Show -MapHS90: ; cb95 (3:4b95) +MapHS90: db POKEMONTOWER_3,$04,Show -MapHS91: ; cb98 (3:4b98) +MapHS91: db POKEMONTOWER_4,$04,Show db POKEMONTOWER_4,$05,Show db POKEMONTOWER_4,$06,Show -MapHS92: ; cba1 (3:4ba1) +MapHS92: db POKEMONTOWER_5,$06,Show -MapHS93: ; cba4 (3:4ba4) +MapHS93: db POKEMONTOWER_6,$04,Show db POKEMONTOWER_6,$05,Show -MapHS94: ; cbaa (3:4baa) +MapHS94: db POKEMONTOWER_7,$01,Show db POKEMONTOWER_7,$02,Show db POKEMONTOWER_7,$03,Show db POKEMONTOWER_7,$04,Show -MapHS95: ; cbb6 (3:4bb6) +MapHS95: db LAVENDER_HOUSE_1,$05,Hide -MapHS84: ; cbb9 (3:4bb9) +MapHS84: db CELADON_MANSION_5,$02,Show -MapHS87: ; cbbc (3:4bbc) +MapHS87: db GAME_CORNER,$0B,Show -MapHS9B: ; cbbf (3:4bbf) +MapHS9B: db FUCHSIA_HOUSE_2,$02,Show -MapHSA5: ; cbc2 (3:4bc2) +MapHSA5: db MANSION_1,$02,Show db MANSION_1,$03,Show -MapHSB1: ; cbc8 (3:4bc8) +MapHSB1: db FIGHTING_DOJO,$06,Show db FIGHTING_DOJO,$07,Show -MapHSB5: ; cbce (3:4bce) +MapHSB5: db SILPH_CO_1F,$01,Hide -MapHS53: ; cbd1 (3:4bd1) +MapHS53: db POWER_PLANT,$01,Show db POWER_PLANT,$02,Show db POWER_PLANT,$03,Show @@ -395,84 +395,84 @@ MapHS53: ; cbd1 (3:4bd1) db POWER_PLANT,$0C,Show db POWER_PLANT,$0D,Show db POWER_PLANT,$0E,Show -MapHSC2: ; cbfb (3:4bfb) +MapHSC2: db VICTORY_ROAD_2,$06,Show db VICTORY_ROAD_2,$07,Show db VICTORY_ROAD_2,$08,Show db VICTORY_ROAD_2,$09,Show db VICTORY_ROAD_2,$0A,Show db VICTORY_ROAD_2,$0D,Show -MapHS58: ; cc0d (3:4c0d) +MapHS58: db BILLS_HOUSE,$01,Show db BILLS_HOUSE,$02,Hide db BILLS_HOUSE,$03,Hide -MapHS33: ; cc16 (3:4c16) +MapHS33: db VIRIDIAN_FOREST,$05,Show db VIRIDIAN_FOREST,$06,Show db VIRIDIAN_FOREST,$07,Show -MapHS3B: ; cc1f (3:4c1f) +MapHS3B: db MT_MOON_1,$08,Show db MT_MOON_1,$09,Show db MT_MOON_1,$0A,Show db MT_MOON_1,$0B,Show db MT_MOON_1,$0C,Show db MT_MOON_1,$0D,Show -MapHS3D: ; cc31 (3:4c31) +MapHS3D: db MT_MOON_3,$06,Show db MT_MOON_3,$07,Show db MT_MOON_3,$08,Show db MT_MOON_3,$09,Show -MapHS60: ; cc3d (3:4c3d) +MapHS60: db SS_ANNE_2,$02,Hide -MapHS66: ; cc40 (3:4c40) +MapHS66: db SS_ANNE_8,$0A,Show -MapHS67: ; cc43 (3:4c43) +MapHS67: db SS_ANNE_9,$06,Show db SS_ANNE_9,$09,Show -MapHS68: ; cc49 (3:4c49) +MapHS68: db SS_ANNE_10,$09,Show db SS_ANNE_10,$0A,Show db SS_ANNE_10,$0B,Show -MapHSC6: ; cc52 (3:4c52) +MapHSC6: db VICTORY_ROAD_3,$05,Show db VICTORY_ROAD_3,$06,Show db VICTORY_ROAD_3,$0A,Show -MapHSC7: ; cc5b (3:4c5b) +MapHSC7: db ROCKET_HIDEOUT_1,$06,Show db ROCKET_HIDEOUT_1,$07,Show -MapHSC8: ; cc61 (3:4c61) +MapHSC8: db ROCKET_HIDEOUT_2,$02,Show db ROCKET_HIDEOUT_2,$03,Show db ROCKET_HIDEOUT_2,$04,Show db ROCKET_HIDEOUT_2,$05,Show -MapHSC9: ; cc6d (3:4c6d) +MapHSC9: db ROCKET_HIDEOUT_3,$03,Show db ROCKET_HIDEOUT_3,$04,Show -MapHSCA: ; cc73 (3:4c73) +MapHSCA: db ROCKET_HIDEOUT_4,$01,Show db ROCKET_HIDEOUT_4,$05,Show db ROCKET_HIDEOUT_4,$06,Show db ROCKET_HIDEOUT_4,$07,Show db ROCKET_HIDEOUT_4,$08,Hide db ROCKET_HIDEOUT_4,$09,Hide -MapHSCF: ; cc85 (3:4c85) +MapHSCF: db SILPH_CO_2F,$01,Show db SILPH_CO_2F,$02,Show db SILPH_CO_2F,$03,Show db SILPH_CO_2F,$04,Show db SILPH_CO_2F,$05,Show -MapHSD0: ; cc94 (3:4c94) +MapHSD0: db SILPH_CO_3F,$02,Show db SILPH_CO_3F,$03,Show db SILPH_CO_3F,$04,Show -MapHSD1: ; cc9d (3:4c9d) +MapHSD1: db SILPH_CO_4F,$02,Show db SILPH_CO_4F,$03,Show db SILPH_CO_4F,$04,Show db SILPH_CO_4F,$05,Show db SILPH_CO_4F,$06,Show db SILPH_CO_4F,$07,Show -MapHSD2: ; ccaf (3:4caf) +MapHSD2: db SILPH_CO_5F,$02,Show db SILPH_CO_5F,$03,Show db SILPH_CO_5F,$04,Show @@ -480,13 +480,13 @@ MapHSD2: ; ccaf (3:4caf) db SILPH_CO_5F,$06,Show db SILPH_CO_5F,$07,Show db SILPH_CO_5F,$08,Show -MapHSD3: ; ccc4 (3:4cc4) +MapHSD3: db SILPH_CO_6F,$06,Show db SILPH_CO_6F,$07,Show db SILPH_CO_6F,$08,Show db SILPH_CO_6F,$09,Show db SILPH_CO_6F,$0A,Show -MapHSD4: ; ccd3 (3:4cd3) +MapHSD4: db SILPH_CO_7F,$05,Show db SILPH_CO_7F,$06,Show db SILPH_CO_7F,$07,Show @@ -495,81 +495,81 @@ MapHSD4: ; ccd3 (3:4cd3) db SILPH_CO_7F,$0A,Show db SILPH_CO_7F,$0B,Show db SILPH_CO_7F,$0C,Show -MapHSD5: ; cceb (3:4ceb) +MapHSD5: db SILPH_CO_8F,$02,Show db SILPH_CO_8F,$03,Show db SILPH_CO_8F,$04,Show -MapHSE9: ; ccf4 (3:4cf4) +MapHSE9: db SILPH_CO_9F,$02,Show db SILPH_CO_9F,$03,Show db SILPH_CO_9F,$04,Show -MapHSEA: ; ccfd (3:4cfd) +MapHSEA: db SILPH_CO_10F,$01,Show db SILPH_CO_10F,$02,Show db SILPH_CO_10F,$03,Show db SILPH_CO_10F,$04,Show db SILPH_CO_10F,$05,Show db SILPH_CO_10F,$06,Show -MapHSEB: ; cd0f (3:4d0f) +MapHSEB: db SILPH_CO_11F,$03,Show db SILPH_CO_11F,$04,Show db SILPH_CO_11F,$05,Show -MapHSF4: ; cd18 (3:4d18) +MapHSF4: db $F4,$02,Show -MapHSD6: ; cd1b (3:4d1b) +MapHSD6: db MANSION_2,$02,Show -MapHSD7: ; cd1e (3:4d1e) +MapHSD7: db MANSION_3,$03,Show db MANSION_3,$04,Show -MapHSD8: ; cd24 (3:4d24) +MapHSD8: db MANSION_4,$03,Show db MANSION_4,$04,Show db MANSION_4,$05,Show db MANSION_4,$06,Show db MANSION_4,$08,Show -MapHSD9: ; cd33 (3:4d33) +MapHSD9: db SAFARI_ZONE_EAST,$01,Show db SAFARI_ZONE_EAST,$02,Show db SAFARI_ZONE_EAST,$03,Show db SAFARI_ZONE_EAST,$04,Show -MapHSDA: ; cd3f (3:4d3f) +MapHSDA: db SAFARI_ZONE_NORTH,$01,Show db SAFARI_ZONE_NORTH,$02,Show -MapHSDB: ; cd45 (3:4d45) +MapHSDB: db SAFARI_ZONE_WEST,$01,Show db SAFARI_ZONE_WEST,$02,Show db SAFARI_ZONE_WEST,$03,Show db SAFARI_ZONE_WEST,$04,Show -MapHSDC: ; cd51 (3:4d51) +MapHSDC: db SAFARI_ZONE_CENTER,$01,Show -MapHSE2: ; cd54 (3:4d54) +MapHSE2: db UNKNOWN_DUNGEON_2,$01,Show db UNKNOWN_DUNGEON_2,$02,Show db UNKNOWN_DUNGEON_2,$03,Show -MapHSE3: ; cd5d (3:4d5d) +MapHSE3: db UNKNOWN_DUNGEON_3,$01,Show db UNKNOWN_DUNGEON_3,$02,Show db UNKNOWN_DUNGEON_3,$03,Show -MapHS6C: ; cd66 (3:4d66) +MapHS6C: db VICTORY_ROAD_1,$03,Show db VICTORY_ROAD_1,$04,Show -MapHS78: ; cd6c (3:4d6c) +MapHS78: db CHAMPIONS_ROOM,$02,Hide -MapHSC0: ; cd6f (3:4d6f) +MapHSC0: db SEAFOAM_ISLANDS_1,$01,Show db SEAFOAM_ISLANDS_1,$02,Show -MapHS9F: ; cd75 (3:4d75) +MapHS9F: db SEAFOAM_ISLANDS_2,$01,Hide db SEAFOAM_ISLANDS_2,$02,Hide -MapHSA0: ; cd7b (3:4d7b) +MapHSA0: db SEAFOAM_ISLANDS_3,$01,Hide db SEAFOAM_ISLANDS_3,$02,Hide -MapHSA1: ; cd81 (3:4d81) +MapHSA1: db SEAFOAM_ISLANDS_4,$02,Show db SEAFOAM_ISLANDS_4,$03,Show db SEAFOAM_ISLANDS_4,$05,Hide db SEAFOAM_ISLANDS_4,$06,Hide -MapHSA2: ; cd8d (3:4d8d) +MapHSA2: db SEAFOAM_ISLANDS_5,$01,Hide db SEAFOAM_ISLANDS_5,$02,Hide db SEAFOAM_ISLANDS_5,$03,Show diff --git a/data/item_prices.asm b/data/item_prices.asm index c36e1c69..15a1bd34 100755 --- a/data/item_prices.asm +++ b/data/item_prices.asm @@ -1,4 +1,4 @@ -ItemPrices: ; 4608 (1:4608) +ItemPrices: money 0 ; MASTER_BALL money 1200 ; ULTRA_BALL money 600 ; GREAT_BALL diff --git a/data/key_items.asm b/data/key_items.asm index 9e2d16fe..afa586af 100755 --- a/data/key_items.asm +++ b/data/key_items.asm @@ -1,4 +1,4 @@ -KeyItemBitfield: ; e799 (3:6799) +KeyItemBitfield: db %11110000 db %00000001 db %11110000 diff --git a/data/mapHeaders/celadoncity.asm b/data/mapHeaders/celadoncity.asm index 7e3a6c06..7f94cad5 100755 --- a/data/mapHeaders/celadoncity.asm +++ b/data/mapHeaders/celadoncity.asm @@ -1,4 +1,4 @@ -CeladonCity_h: ; 18000 (6:4000) +CeladonCity_h: db OVERWORLD ; tileset db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/gary.asm b/data/mapHeaders/gary.asm index 5b1a1f98..792c4b32 100755 --- a/data/mapHeaders/gary.asm +++ b/data/mapHeaders/gary.asm @@ -1,4 +1,4 @@ -Gary_h: ; 75f11 (1d:5f11) +Gary_h: db GYM ;tileset db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; Height, Width dw GaryBlocks, GaryTextPointers, GaryScript diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm index 5ad13aea..a957314c 100755 --- a/data/mapHeaders/pallettown.asm +++ b/data/mapHeaders/pallettown.asm @@ -1,4 +1,4 @@ -PalletTown_h: ; 182a1 (6:42a1) +PalletTown_h: db OVERWORLD ; tileset db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript diff --git a/data/mapHeaders/redshouse1f.asm b/data/mapHeaders/redshouse1f.asm index 02dcc082..82d83042 100755 --- a/data/mapHeaders/redshouse1f.asm +++ b/data/mapHeaders/redshouse1f.asm @@ -1,4 +1,4 @@ -RedsHouse1F_h: ; 4815c (12:415c) +RedsHouse1F_h: db REDS_HOUSE_1 ; tileset db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript diff --git a/data/mapHeaders/redshouse2f.asm b/data/mapHeaders/redshouse2f.asm index 6b72d7db..c4b0969c 100755 --- a/data/mapHeaders/redshouse2f.asm +++ b/data/mapHeaders/redshouse2f.asm @@ -1,4 +1,4 @@ -RedsHouse2F_h: ; 5c0a4 (17:40a4) +RedsHouse2F_h: db REDS_HOUSE_2 ; tileset db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript diff --git a/data/mapHeaders/route15gateupstairs.asm b/data/mapHeaders/route15gateupstairs.asm index 0687ab28..96e7e2ca 100755 --- a/data/mapHeaders/route15gateupstairs.asm +++ b/data/mapHeaders/route15gateupstairs.asm @@ -1,4 +1,4 @@ -Route15GateUpstairs_h: ; 4963e (12:563e) +Route15GateUpstairs_h: db GATE ; tileset db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 564f4a58..38e80842 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -1,4 +1,4 @@ -Route2_h: ; 54000 (15:4000) +Route2_h: db 00 ; Tileset db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles) dw Route2Blocks, Route2TextPointers, Route2Script diff --git a/data/mapHeaders/undergroundpathentranceroute7copy.asm b/data/mapHeaders/undergroundpathentranceroute7copy.asm index e5e6cfa0..e12ee454 100755 --- a/data/mapHeaders/undergroundpathentranceroute7copy.asm +++ b/data/mapHeaders/undergroundpathentranceroute7copy.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d) +UndergroundPathEntranceRoute7Copy_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 43ba02e4..231e852d 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -1,4 +1,4 @@ -BluesHouseObject: ; 19bce (6:5bce) +BluesHouseObject: db $0A ; border block db $2 ; warps diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 4f977b2c..4d32ea3d 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -1,4 +1,4 @@ -RedsHouse1FObject: ; 481e4 (12:41e4) +RedsHouse1FObject: db $0A ; border block db $3 ; warps diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index 4362ade0..c4cdcea8 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -1,4 +1,4 @@ -Route15GateUpstairsObject: ; 4969d (12:569d) +Route15GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index 707a0e0e..04a5bf2f 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787) +UndergroundPathEntranceRoute7CopyObject: db $a ; border block db $3 ; warps diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 8796a608..ab8ae1ca 100755 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -1,5 +1,5 @@ ; see also MapHeaderPointers -MapHeaderBanks: ; c23d (3:423d) +MapHeaderBanks: db BANK(PalletTown_h) ;PALLET_TOWN db BANK(ViridianCity_h) ; VIRIDIAN_CITY db BANK(PewterCity_h) ; PEWTER_CITY diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 746d3211..b777e4ca 100755 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -1,5 +1,5 @@ ; see also MapHeaderBanks -MapHeaderPointers:: ; 01ae (0:01ae) +MapHeaderPointers:: dw PalletTown_h dw ViridianCity_h dw PewterCity_h diff --git a/data/map_songs.asm b/data/map_songs.asm index 8fee18d2..892f475e 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -1,4 +1,4 @@ -MapSongBanks: ; c04d (3:404d) +MapSongBanks: db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm index 8a8aecdb..8c4d0bc0 100755 --- a/data/mon_palettes.asm +++ b/data/mon_palettes.asm @@ -1,4 +1,4 @@ -MonsterPalettes: ; 725c8 (1c:65c8) +MonsterPalettes: db PAL_MEWMON ; MISSINGNO db PAL_GREENMON ; BULBASAUR db PAL_GREENMON ; IVYSAUR diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm index 7e434dce..d83e7b4e 100755 --- a/data/mon_party_sprites.asm +++ b/data/mon_party_sprites.asm @@ -1,4 +1,4 @@ -MonPartyData: ; 7190d (1c:590d) +MonPartyData: dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 6f06d699..3fb2d3c6 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -1,4 +1,4 @@ -PokedexEntryPointers: ; 4047e (10:447e) +PokedexEntryPointers: dw RhydonDexEntry dw KangaskhanDexEntry dw NidoranMDexEntry @@ -195,1064 +195,1064 @@ PokedexEntryPointers: ; 4047e (10:447e) ; weight in pounds ; text entry -RhydonDexEntry: ; 405fa (10:45fa) +RhydonDexEntry: db "DRILL@" db 6,3 dw 2650 TX_FAR _RhydonDexEntry db "@" -KangaskhanDexEntry: ; 40609 (10:4609) +KangaskhanDexEntry: db "PARENT@" db 7,3 dw 1760 TX_FAR _KangaskhanDexEntry db "@" -NidoranMDexEntry: ; 40619 (10:4619) +NidoranMDexEntry: db "POISON PIN@" db 1,8 dw 200 TX_FAR _NidoranMDexEntry db "@" -ClefairyDexEntry: ; 4062d (10:462d) +ClefairyDexEntry: db "FAIRY@" db 2,0 dw 170 TX_FAR _ClefairyDexEntry db "@" -SpearowDexEntry: ; 4063c (10:463c) +SpearowDexEntry: db "TINY BIRD@" db 1,0 dw 40 TX_FAR _SpearowDexEntry db "@" -VoltorbDexEntry: ; 4064f (10:464f) +VoltorbDexEntry: db "BALL@" db 1,8 dw 230 TX_FAR _VoltorbDexEntry db "@" -NidokingDexEntry: ; 4065d (10:465d) +NidokingDexEntry: db "DRILL@" db 4,7 dw 1370 TX_FAR _NidokingDexEntry db "@" -SlowbroDexEntry: ; 4066c (10:466c) +SlowbroDexEntry: db "HERMITCRAB@" db 5,3 dw 1730 TX_FAR _SlowbroDexEntry db "@" -IvysaurDexEntry: ; 40680 (10:4680) +IvysaurDexEntry: db "SEED@" db 3,3 dw 290 TX_FAR _IvysaurDexEntry db "@" -ExeggutorDexEntry: ; 4068e (10:468e) +ExeggutorDexEntry: db "COCONUT@" db 6,7 dw 2650 TX_FAR _ExeggutorDexEntry db "@" -LickitungDexEntry: ; 4069f (10:469f) +LickitungDexEntry: db "LICKING@" db 3,11 dw 1440 TX_FAR _LickitungDexEntry db "@" -ExeggcuteDexEntry: ; 406b0 (10:46b0) +ExeggcuteDexEntry: db "EGG@" db 1,4 dw 60 TX_FAR _ExeggcuteDexEntry db "@" -GrimerDexEntry: ; 406bd (10:46bd) +GrimerDexEntry: db "SLUDGE@" db 2,11 dw 660 TX_FAR _GrimerDexEntry db "@" -GengarDexEntry: ; 406cd (10:46cd) +GengarDexEntry: db "SHADOW@" db 4,11 dw 890 TX_FAR _GengarDexEntry db "@" -NidoranFDexEntry: ; 406dd (10:46dd) +NidoranFDexEntry: db "POISON PIN@" db 1,4 dw 150 TX_FAR _NidoranFDexEntry db "@" -NidoqueenDexEntry: ; 406f1 (10:46f1) +NidoqueenDexEntry: db "DRILL@" db 4,3 dw 1320 TX_FAR _NidoqueenDexEntry db "@" -CuboneDexEntry: ; 40700 (10:4700) +CuboneDexEntry: db "LONELY@" db 1,4 dw 140 TX_FAR _CuboneDexEntry db "@" -RhyhornDexEntry: ; 40710 (10:4710) +RhyhornDexEntry: db "SPIKES@" db 3,3 dw 2540 TX_FAR _RhyhornDexEntry db "@" -LaprasDexEntry: ; 40720 (10:4720) +LaprasDexEntry: db "TRANSPORT@" db 8,2 dw 4850 TX_FAR _LaprasDexEntry db "@" -ArcanineDexEntry: ; 40733 (10:4733) +ArcanineDexEntry: db "LEGENDARY@" db 6,3 dw 3420 TX_FAR _ArcanineDexEntry db "@" -MewDexEntry: ; 40746 (10:4746) +MewDexEntry: db "NEW SPECIE@" db 1,4 dw 90 TX_FAR _MewDexEntry db "@" -GyaradosDexEntry: ; 4075a (10:475a) +GyaradosDexEntry: db "ATROCIOUS@" db 21,4 dw 5180 TX_FAR _GyaradosDexEntry db "@" -ShellderDexEntry: ; 4076d (10:476d) +ShellderDexEntry: db "BIVALVE@" db 1,0 dw 90 TX_FAR _ShellderDexEntry db "@" -TentacoolDexEntry: ; 4077e (10:477e) +TentacoolDexEntry: db "JELLYFISH@" db 2,11 dw 1000 TX_FAR _TentacoolDexEntry db "@" -GastlyDexEntry: ; 40791 (10:4791) +GastlyDexEntry: db "GAS@" db 4,3 dw 2 TX_FAR _GastlyDexEntry db "@" -ScytherDexEntry: ; 4079e (10:479e) +ScytherDexEntry: db "MANTIS@" db 4,11 dw 1230 TX_FAR _ScytherDexEntry db "@" -StaryuDexEntry: ; 407ae (10:47ae) +StaryuDexEntry: db "STARSHAPE@" db 2,7 dw 760 TX_FAR _StaryuDexEntry db "@" -BlastoiseDexEntry: ; 407c1 (10:47c1) +BlastoiseDexEntry: db "SHELLFISH@" db 5,3 dw 1890 TX_FAR _BlastoiseDexEntry db "@" -PinsirDexEntry: ; 407d4 (10:47d4) +PinsirDexEntry: db "STAGBEETLE@" db 4,11 dw 1210 TX_FAR _PinsirDexEntry db "@" -TangelaDexEntry: ; 407e8 (10:47e8) +TangelaDexEntry: db "VINE@" db 3,3 dw 770 TX_FAR _TangelaDexEntry db "@" -GrowlitheDexEntry: ; 407f6 (10:47f6) +GrowlitheDexEntry: db "PUPPY@" db 2,4 dw 420 TX_FAR _GrowlitheDexEntry db "@" -OnixDexEntry: ; 40805 (10:4805) +OnixDexEntry: db "ROCK SNAKE@" db 28,10 dw 4630 TX_FAR _OnixDexEntry db "@" -FearowDexEntry: ; 40819 (10:4819) +FearowDexEntry: db "BEAK@" db 3,11 dw 840 TX_FAR _FearowDexEntry db "@" -PidgeyDexEntry: ; 40827 (10:4827) +PidgeyDexEntry: db "TINY BIRD@" db 1,0 dw 40 TX_FAR _PidgeyDexEntry db "@" -SlowpokeDexEntry: ; 4083a (10:483a) +SlowpokeDexEntry: db "DOPEY@" db 3,11 dw 790 TX_FAR _SlowpokeDexEntry db "@" -KadabraDexEntry: ; 40849 (10:4849) +KadabraDexEntry: db "PSI@" db 4,3 dw 1250 TX_FAR _KadabraDexEntry db "@" -GravelerDexEntry: ; 40856 (10:4856) +GravelerDexEntry: db "ROCK@" db 3,3 dw 2320 TX_FAR _GravelerDexEntry db "@" -ChanseyDexEntry: ; 40864 (10:4864) +ChanseyDexEntry: db "EGG@" db 3,7 dw 760 TX_FAR _ChanseyDexEntry db "@" -MachokeDexEntry: ; 40871 (10:4871) +MachokeDexEntry: db "SUPERPOWER@" db 4,11 dw 1550 TX_FAR _MachokeDexEntry db "@" -MrMimeDexEntry: ; 40885 (10:4885) +MrMimeDexEntry: db "BARRIER@" db 4,3 dw 1200 TX_FAR _MrMimeDexEntry db "@" -HitmonleeDexEntry: ; 40896 (10:4896) +HitmonleeDexEntry: db "KICKING@" db 4,11 dw 1100 TX_FAR _HitmonleeDexEntry db "@" -HitmonchanDexEntry: ; 408a7 (10:48a7) +HitmonchanDexEntry: db "PUNCHING@" db 4,7 dw 1110 TX_FAR _HitmonchanDexEntry db "@" -ArbokDexEntry: ; 408b9 (10:48b9) +ArbokDexEntry: db "COBRA@" db 11,6 dw 1430 TX_FAR _ArbokDexEntry db "@" -ParasectDexEntry: ; 408c8 (10:48c8) +ParasectDexEntry: db "MUSHROOM@" db 3,3 dw 650 TX_FAR _ParasectDexEntry db "@" -PsyduckDexEntry: ; 408da (10:48da) +PsyduckDexEntry: db "DUCK@" db 2,7 dw 430 TX_FAR _PsyduckDexEntry db "@" -DrowzeeDexEntry: ; 408e8 (10:48e8) +DrowzeeDexEntry: db "HYPNOSIS@" db 3,3 dw 710 TX_FAR _DrowzeeDexEntry db "@" -GolemDexEntry: ; 408fa (10:48fa) +GolemDexEntry: db "MEGATON@" db 4,7 dw 6620 TX_FAR _GolemDexEntry db "@" -MagmarDexEntry: ; 4090b (10:490b) +MagmarDexEntry: db "SPITFIRE@" db 4,3 dw 980 TX_FAR _MagmarDexEntry db "@" -ElectabuzzDexEntry: ; 4091d (10:491d) +ElectabuzzDexEntry: db "ELECTRIC@" db 3,7 dw 660 TX_FAR _ElectabuzzDexEntry db "@" -MagnetonDexEntry: ; 4092f (10:492f) +MagnetonDexEntry: db "MAGNET@" db 3,3 dw 1320 TX_FAR _MagnetonDexEntry db "@" -KoffingDexEntry: ; 4093f (10:493f) +KoffingDexEntry: db "POISON GAS@" db 2,0 dw 20 TX_FAR _KoffingDexEntry db "@" -MankeyDexEntry: ; 40953 (10:4953) +MankeyDexEntry: db "PIG MONKEY@" db 1,8 dw 620 TX_FAR _MankeyDexEntry db "@" -SeelDexEntry: ; 40967 (10:4967) +SeelDexEntry: db "SEA LION@" db 3,7 dw 1980 TX_FAR _SeelDexEntry db "@" -DiglettDexEntry: ; 40979 (10:4979) +DiglettDexEntry: db "MOLE@" db 0,8 dw 20 TX_FAR _DiglettDexEntry db "@" -TaurosDexEntry: ; 40987 (10:4987) +TaurosDexEntry: db "WILD BULL@" db 4,7 dw 1950 TX_FAR _TaurosDexEntry db "@" -FarfetchdDexEntry: ; 4099a (10:499a) +FarfetchdDexEntry: db "WILD DUCK@" db 2,7 dw 330 TX_FAR _FarfetchdDexEntry db "@" -VenonatDexEntry: ; 409ad (10:49ad) +VenonatDexEntry: db "INSECT@" db 3,3 dw 660 TX_FAR _VenonatDexEntry db "@" -DragoniteDexEntry: ; 409bd (10:49bd) +DragoniteDexEntry: db "DRAGON@" db 7,3 dw 4630 TX_FAR _DragoniteDexEntry db "@" -DoduoDexEntry: ; 409cd (10:49cd) +DoduoDexEntry: db "TWIN BIRD@" db 4,7 dw 860 TX_FAR _DoduoDexEntry db "@" -PoliwagDexEntry: ; 409e0 (10:49e0) +PoliwagDexEntry: db "TADPOLE@" db 2,0 dw 270 TX_FAR _PoliwagDexEntry db "@" -JynxDexEntry: ; 409f1 (10:49f1) +JynxDexEntry: db "HUMANSHAPE@" db 4,7 dw 900 TX_FAR _JynxDexEntry db "@" -MoltresDexEntry: ; 40a05 (10:4a05) +MoltresDexEntry: db "FLAME@" db 6,7 dw 1320 TX_FAR _MoltresDexEntry db "@" -ArticunoDexEntry: ; 40a14 (10:4a14) +ArticunoDexEntry: db "FREEZE@" db 5,7 dw 1220 TX_FAR _ArticunoDexEntry db "@" -ZapdosDexEntry: ; 40a24 (10:4a24) +ZapdosDexEntry: db "ELECTRIC@" db 5,3 dw 1160 TX_FAR _ZapdosDexEntry db "@" -DittoDexEntry: ; 40a36 (10:4a36) +DittoDexEntry: db "TRANSFORM@" db 1,0 dw 90 TX_FAR _DittoDexEntry db "@" -MeowthDexEntry: ; 40a49 (10:4a49) +MeowthDexEntry: db "SCRATCHCAT@" db 1,4 dw 90 TX_FAR _MeowthDexEntry db "@" -KrabbyDexEntry: ; 40a5d (10:4a5d) +KrabbyDexEntry: db "RIVER CRAB@" db 1,4 dw 140 TX_FAR _KrabbyDexEntry db "@" -VulpixDexEntry: ; 40a71 (10:4a71) +VulpixDexEntry: db "FOX@" db 2,0 dw 220 TX_FAR _VulpixDexEntry db "@" -NinetalesDexEntry: ; 40a7e (10:4a7e) +NinetalesDexEntry: db "FOX@" db 3,7 dw 440 TX_FAR _NinetalesDexEntry db "@" -PikachuDexEntry: ; 40a8b (10:4a8b) +PikachuDexEntry: db "MOUSE@" db 1,4 dw 130 TX_FAR _PikachuDexEntry db "@" -RaichuDexEntry: ; 40a9a (10:4a9a) +RaichuDexEntry: db "MOUSE@" db 2,7 dw 660 TX_FAR _RaichuDexEntry db "@" -DratiniDexEntry: ; 40aa9 (10:4aa9) +DratiniDexEntry: db "DRAGON@" db 5,11 dw 70 TX_FAR _DratiniDexEntry db "@" -DragonairDexEntry: ; 40ab9 (10:4ab9) +DragonairDexEntry: db "DRAGON@" db 13,1 dw 360 TX_FAR _DragonairDexEntry db "@" -KabutoDexEntry: ; 40ac9 (10:4ac9) +KabutoDexEntry: db "SHELLFISH@" db 1,8 dw 250 TX_FAR _KabutoDexEntry db "@" -KabutopsDexEntry: ; 40adc (10:4adc) +KabutopsDexEntry: db "SHELLFISH@" db 4,3 dw 890 TX_FAR _KabutopsDexEntry db "@" -HorseaDexEntry: ; 40aef (10:4aef) +HorseaDexEntry: db "DRAGON@" db 1,4 dw 180 TX_FAR _HorseaDexEntry db "@" -SeadraDexEntry: ; 40aff (10:4aff) +SeadraDexEntry: db "DRAGON@" db 3,11 dw 550 TX_FAR _SeadraDexEntry db "@" -SandshrewDexEntry: ; 40b0f (10:4b0f) +SandshrewDexEntry: db "MOUSE@" db 2,0 dw 260 TX_FAR _SandshrewDexEntry db "@" -SandslashDexEntry: ; 40b1e (10:4b1e) +SandslashDexEntry: db "MOUSE@" db 3,3 dw 650 TX_FAR _SandslashDexEntry db "@" -OmanyteDexEntry: ; 40b2d (10:4b2d) +OmanyteDexEntry: db "SPIRAL@" db 1,4 dw 170 TX_FAR _OmanyteDexEntry db "@" -OmastarDexEntry: ; 40b3d (10:4b3d) +OmastarDexEntry: db "SPIRAL@" db 3,3 dw 770 TX_FAR _OmastarDexEntry db "@" -JigglypuffDexEntry: ; 40b4d (10:4b4d) +JigglypuffDexEntry: db "BALLOON@" db 1,8 dw 120 TX_FAR _JigglypuffDexEntry db "@" -WigglytuffDexEntry: ; 40b5e (10:4b5e) +WigglytuffDexEntry: db "BALLOON@" db 3,3 dw 260 TX_FAR _WigglytuffDexEntry db "@" -EeveeDexEntry: ; 40b6f (10:4b6f) +EeveeDexEntry: db "EVOLUTION@" db 1,0 dw 140 TX_FAR _EeveeDexEntry db "@" -FlareonDexEntry: ; 40b82 (10:4b82) +FlareonDexEntry: db "FLAME@" db 2,11 dw 550 TX_FAR _FlareonDexEntry db "@" -JolteonDexEntry: ; 40b91 (10:4b91) +JolteonDexEntry: db "LIGHTNING@" db 2,7 dw 540 TX_FAR _JolteonDexEntry db "@" -VaporeonDexEntry: ; 40ba4 (10:4ba4) +VaporeonDexEntry: db "BUBBLE JET@" db 3,3 dw 640 TX_FAR _VaporeonDexEntry db "@" -MachopDexEntry: ; 40bb8 (10:4bb8) +MachopDexEntry: db "SUPERPOWER@" db 2,7 dw 430 TX_FAR _MachopDexEntry db "@" -ZubatDexEntry: ; 40bcc (10:4bcc) +ZubatDexEntry: db "BAT@" db 2,7 dw 170 TX_FAR _ZubatDexEntry db "@" -EkansDexEntry: ; 40bd9 (10:4bd9) +EkansDexEntry: db "SNAKE@" db 6,7 dw 150 TX_FAR _EkansDexEntry db "@" -ParasDexEntry: ; 40be8 (10:4be8) +ParasDexEntry: db "MUSHROOM@" db 1,0 dw 120 TX_FAR _ParasDexEntry db "@" -PoliwhirlDexEntry: ; 40bfa (10:4bfa) +PoliwhirlDexEntry: db "TADPOLE@" db 3,3 dw 440 TX_FAR _PoliwhirlDexEntry db "@" -PoliwrathDexEntry: ; 40c0b (10:4c0b) +PoliwrathDexEntry: db "TADPOLE@" db 4,3 dw 1190 TX_FAR _PoliwrathDexEntry db "@" -WeedleDexEntry: ; 40c1c (10:4c1c) +WeedleDexEntry: db "HAIRY BUG@" db 1,0 dw 70 TX_FAR _WeedleDexEntry db "@" -KakunaDexEntry: ; 40c2f (10:4c2f) +KakunaDexEntry: db "COCOON@" db 2,0 dw 220 TX_FAR _KakunaDexEntry db "@" -BeedrillDexEntry: ; 40c3f (10:4c3f) +BeedrillDexEntry: db "POISON BEE@" db 3,3 dw 650 TX_FAR _BeedrillDexEntry db "@" -DodrioDexEntry: ; 40c53 (10:4c53) +DodrioDexEntry: db "TRIPLEBIRD@" db 5,11 dw 1880 TX_FAR _DodrioDexEntry db "@" -PrimeapeDexEntry: ; 40c67 (10:4c67) +PrimeapeDexEntry: db "PIG MONKEY@" db 3,3 dw 710 TX_FAR _PrimeapeDexEntry db "@" -DugtrioDexEntry: ; 40c7b (10:4c7b) +DugtrioDexEntry: db "MOLE@" db 2,4 dw 730 TX_FAR _DugtrioDexEntry db "@" -VenomothDexEntry: ; 40c89 (10:4c89) +VenomothDexEntry: db "POISONMOTH@" db 4,11 dw 280 TX_FAR _VenomothDexEntry db "@" -DewgongDexEntry: ; 40c9d (10:4c9d) +DewgongDexEntry: db "SEA LION@" db 5,7 dw 2650 TX_FAR _DewgongDexEntry db "@" -CaterpieDexEntry: ; 40caf (10:4caf) +CaterpieDexEntry: db "WORM@" db 1,0 dw 60 TX_FAR _CaterpieDexEntry db "@" -MetapodDexEntry: ; 40cbd (10:4cbd) +MetapodDexEntry: db "COCOON@" db 2,4 dw 220 TX_FAR _MetapodDexEntry db "@" -ButterfreeDexEntry: ; 40ccd (10:4ccd) +ButterfreeDexEntry: db "BUTTERFLY@" db 3,7 dw 710 TX_FAR _ButterfreeDexEntry db "@" -MachampDexEntry: ; 40ce0 (10:4ce0) +MachampDexEntry: db "SUPERPOWER@" db 5,3 dw 2870 TX_FAR _MachampDexEntry db "@" -GolduckDexEntry: ; 40cf4 (10:4cf4) +GolduckDexEntry: db "DUCK@" db 5,7 dw 1690 TX_FAR _GolduckDexEntry db "@" -HypnoDexEntry: ; 40d02 (10:4d02) +HypnoDexEntry: db "HYPNOSIS@" db 5,3 dw 1670 TX_FAR _HypnoDexEntry db "@" -GolbatDexEntry: ; 40d14 (10:4d14) +GolbatDexEntry: db "BAT@" db 5,3 dw 1210 TX_FAR _GolbatDexEntry db "@" -MewtwoDexEntry: ; 40d21 (10:4d21) +MewtwoDexEntry: db "GENETIC@" db 6,7 dw 2690 TX_FAR _MewtwoDexEntry db "@" -SnorlaxDexEntry: ; 40d32 (10:4d32) +SnorlaxDexEntry: db "SLEEPING@" db 6,11 dw 10140 TX_FAR _SnorlaxDexEntry db "@" -MagikarpDexEntry: ; 40d44 (10:4d44) +MagikarpDexEntry: db "FISH@" db 2,11 dw 220 TX_FAR _MagikarpDexEntry db "@" -MukDexEntry: ; 40d52 (10:4d52) +MukDexEntry: db "SLUDGE@" db 3,11 dw 660 TX_FAR _MukDexEntry db "@" -KinglerDexEntry: ; 40d62 (10:4d62) +KinglerDexEntry: db "PINCER@" db 4,3 dw 1320 TX_FAR _KinglerDexEntry db "@" -CloysterDexEntry: ; 40d72 (10:4d72) +CloysterDexEntry: db "BIVALVE@" db 4,11 dw 2920 TX_FAR _CloysterDexEntry db "@" -ElectrodeDexEntry: ; 40d83 (10:4d83) +ElectrodeDexEntry: db "BALL@" db 3,11 dw 1470 TX_FAR _ElectrodeDexEntry db "@" -ClefableDexEntry: ; 40d91 (10:4d91) +ClefableDexEntry: db "FAIRY@" db 4,3 dw 880 TX_FAR _ClefableDexEntry db "@" -WeezingDexEntry: ; 40da0 (10:4da0) +WeezingDexEntry: db "POISON GAS@" db 3,11 dw 210 TX_FAR _WeezingDexEntry db "@" -PersianDexEntry: ; 40db4 (10:4db4) +PersianDexEntry: db "CLASSY CAT@" db 3,3 dw 710 TX_FAR _PersianDexEntry db "@" -MarowakDexEntry: ; 40dc8 (10:4dc8) +MarowakDexEntry: db "BONEKEEPER@" db 3,3 dw 990 TX_FAR _MarowakDexEntry db "@" -HaunterDexEntry: ; 40ddc (10:4ddc) +HaunterDexEntry: db "GAS@" db 5,3 dw 2 TX_FAR _HaunterDexEntry db "@" -AbraDexEntry: ; 40de9 (10:4de9) +AbraDexEntry: db "PSI@" db 2,11 dw 430 TX_FAR _AbraDexEntry db "@" -AlakazamDexEntry: ; 40df6 (10:4df6) +AlakazamDexEntry: db "PSI@" db 4,11 dw 1060 TX_FAR _AlakazamDexEntry db "@" -PidgeottoDexEntry: ; 40e03 (10:4e03) +PidgeottoDexEntry: db "BIRD@" db 3,7 dw 660 TX_FAR _PidgeottoDexEntry db "@" -PidgeotDexEntry: ; 40e11 (10:4e11) +PidgeotDexEntry: db "BIRD@" db 4,11 dw 870 TX_FAR _PidgeotDexEntry db "@" -StarmieDexEntry: ; 40e1f (10:4e1f) +StarmieDexEntry: db "MYSTERIOUS@" db 3,7 dw 1760 TX_FAR _StarmieDexEntry db "@" -BulbasaurDexEntry: ; 40e33 (10:4e33) +BulbasaurDexEntry: db "SEED@" db 2,4 dw 150 TX_FAR _BulbasaurDexEntry db "@" -VenusaurDexEntry: ; 40e41 (10:4e41) +VenusaurDexEntry: db "SEED@" db 6,7 dw 2210 TX_FAR _VenusaurDexEntry db "@" -TentacruelDexEntry: ; 40e4f (10:4e4f) +TentacruelDexEntry: db "JELLYFISH@" db 5,3 dw 1210 TX_FAR _TentacruelDexEntry db "@" -GoldeenDexEntry: ; 40e62 (10:4e62) +GoldeenDexEntry: db "GOLDFISH@" db 2,0 dw 330 TX_FAR _GoldeenDexEntry db "@" -SeakingDexEntry: ; 40e74 (10:4e74) +SeakingDexEntry: db "GOLDFISH@" db 4,3 dw 860 TX_FAR _SeakingDexEntry db "@" -PonytaDexEntry: ; 40e86 (10:4e86) +PonytaDexEntry: db "FIRE HORSE@" db 3,3 dw 660 TX_FAR _PonytaDexEntry db "@" -RapidashDexEntry: ; 40e9a (10:4e9a) +RapidashDexEntry: db "FIRE HORSE@" db 5,7 dw 2090 TX_FAR _RapidashDexEntry db "@" -RattataDexEntry: ; 40eae (10:4eae) +RattataDexEntry: db "RAT@" db 1,0 dw 80 TX_FAR _RattataDexEntry db "@" -RaticateDexEntry: ; 40ebb (10:4ebb) +RaticateDexEntry: db "RAT@" db 2,4 dw 410 TX_FAR _RaticateDexEntry db "@" -NidorinoDexEntry: ; 40ec8 (10:4ec8) +NidorinoDexEntry: db "POISON PIN@" db 2,11 dw 430 TX_FAR _NidorinoDexEntry db "@" -NidorinaDexEntry: ; 40edc (10:4edc) +NidorinaDexEntry: db "POISON PIN@" db 2,7 dw 440 TX_FAR _NidorinaDexEntry db "@" -GeodudeDexEntry: ; 40ef0 (10:4ef0) +GeodudeDexEntry: db "ROCK@" db 1,4 dw 440 TX_FAR _GeodudeDexEntry db "@" -PorygonDexEntry: ; 40efe (10:4efe) +PorygonDexEntry: db "VIRTUAL@" db 2,7 dw 800 TX_FAR _PorygonDexEntry db "@" -AerodactylDexEntry: ; 40f0f (10:4f0f) +AerodactylDexEntry: db "FOSSIL@" db 5,11 dw 1300 TX_FAR _AerodactylDexEntry db "@" -MagnemiteDexEntry: ; 40f1f (10:4f1f) +MagnemiteDexEntry: db "MAGNET@" db 1,0 dw 130 TX_FAR _MagnemiteDexEntry db "@" -CharmanderDexEntry: ; 40f2f (10:4f2f) +CharmanderDexEntry: db "LIZARD@" db 2,0 dw 190 TX_FAR _CharmanderDexEntry db "@" -SquirtleDexEntry: ; 40f3f (10:4f3f) +SquirtleDexEntry: db "TINYTURTLE@" db 1,8 dw 200 TX_FAR _SquirtleDexEntry db "@" -CharmeleonDexEntry: ; 40f53 (10:4f53) +CharmeleonDexEntry: db "FLAME@" db 3,7 dw 420 TX_FAR _CharmeleonDexEntry db "@" -WartortleDexEntry: ; 40f62 (10:4f62) +WartortleDexEntry: db "TURTLE@" db 3,3 dw 500 TX_FAR _WartortleDexEntry db "@" -CharizardDexEntry: ; 40f72 (10:4f72) +CharizardDexEntry: db "FLAME@" db 5,7 dw 2000 TX_FAR _CharizardDexEntry db "@" -OddishDexEntry: ; 40f81 (10:4f81) +OddishDexEntry: db "WEED@" db 1,8 dw 120 TX_FAR _OddishDexEntry db "@" -GloomDexEntry: ; 40f8f (10:4f8f) +GloomDexEntry: db "WEED@" db 2,7 dw 190 TX_FAR _GloomDexEntry db "@" -VileplumeDexEntry: ; 40f9d (10:4f9d) +VileplumeDexEntry: db "FLOWER@" db 3,11 dw 410 TX_FAR _VileplumeDexEntry db "@" -BellsproutDexEntry: ; 40fad (10:4fad) +BellsproutDexEntry: db "FLOWER@" db 2,4 dw 90 TX_FAR _BellsproutDexEntry db "@" -WeepinbellDexEntry: ; 40fbd (10:4fbd) +WeepinbellDexEntry: db "FLYCATCHER@" db 3,3 dw 140 TX_FAR _WeepinbellDexEntry db "@" -VictreebelDexEntry: ; 40fd1 (10:4fd1) +VictreebelDexEntry: db "FLYCATCHER@" db 5,7 dw 340 TX_FAR _VictreebelDexEntry db "@" -MissingNoDexEntry: ; 40fe5 (10:4fe5) +MissingNoDexEntry: db "???@" db 10 ; 1.0 m db 100 ; 10.0 kg diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm index 3bd6a15b..0e293946 100755 --- a/data/pokedex_order.asm +++ b/data/pokedex_order.asm @@ -1,4 +1,4 @@ -PokedexOrder: ; 41024 (10:5024) +PokedexOrder: db DEX_RHYDON db DEX_KANGASKHAN db DEX_NIDORAN_M diff --git a/data/prize_mon_levels.asm b/data/prize_mon_levels.asm index 1437649c..bffa4440 100755 --- a/data/prize_mon_levels.asm +++ b/data/prize_mon_levels.asm @@ -1,4 +1,4 @@ -PrizeMonLevelDictionary: ; 5298a (14:698a) +PrizeMonLevelDictionary: IF DEF(_RED) db ABRA,9 db CLEFAIRY,8 diff --git a/data/prizes.asm b/data/prizes.asm index 3d4102b6..1120c0d0 100755 --- a/data/prizes.asm +++ b/data/prizes.asm @@ -1,4 +1,4 @@ -PrizeDifferentMenuPtrs: ; 52843 (14:6843) +PrizeDifferentMenuPtrs: dw PrizeMenuMon1Entries dw PrizeMenuMon1Cost @@ -8,10 +8,10 @@ PrizeDifferentMenuPtrs: ; 52843 (14:6843) dw PrizeMenuTMsEntries dw PrizeMenuTMsCost -NoThanksText: ; 5284f (14:684f) +NoThanksText: db "NO THANKS@" -PrizeMenuMon1Entries: ; 52859 (14:6859) +PrizeMenuMon1Entries: db ABRA db CLEFAIRY IF DEF(_RED) @@ -22,7 +22,7 @@ IF DEF(_BLUE) ENDC db "@" -PrizeMenuMon1Cost: ; 5285d (14:685d) +PrizeMenuMon1Cost: IF DEF(_RED) coins 180 coins 500 @@ -34,7 +34,7 @@ ENDC coins 1200 db "@" -PrizeMenuMon2Entries: ; 52864 (14:6864) +PrizeMenuMon2Entries: IF DEF(_RED) db DRATINI db SCYTHER @@ -46,7 +46,7 @@ ENDC db PORYGON db "@" -PrizeMenuMon2Cost: ; 52868 (14:6868) +PrizeMenuMon2Cost: IF DEF(_RED) coins 2800 coins 5500 @@ -59,13 +59,13 @@ IF DEF(_BLUE) ENDC db "@" -PrizeMenuTMsEntries: ; 5286f (14:686f) +PrizeMenuTMsEntries: db TM_23 db TM_15 db TM_50 db "@" -PrizeMenuTMsCost: ; 52873 (14:6873) +PrizeMenuTMsCost: coins 3300 coins 5500 coins 7700 diff --git a/data/sgb_border.asm b/data/sgb_border.asm index e1da84ac..c2afc193 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -1,4 +1,4 @@ -BorderPalettes: ; 72788 (1c:6788) +BorderPalettes: IF DEF(_RED) INCBIN "gfx/red/sgbborder.map" ENDC @@ -53,7 +53,7 @@ ENDC ds $18 -SGBBorderGraphics: ; 72fe8 (1c:6fe8) +SGBBorderGraphics: IF DEF(_RED) INCBIN "gfx/red/sgbborder.2bpp" ENDC diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index f810db8f..cae91883 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -51,14 +51,14 @@ DATA_SND: MACRO db \3 ; length (1-11) ENDM -BlkPacket_WholeScreen: ; 7219e (1c:619e) +BlkPacket_WholeScreen: ATTR_BLK 1 ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17 ds 8 db $03,$00,$00,$13,$11,$00,$00 -BlkPacket_Battle: ; 721b5 (1c:61b5) +BlkPacket_Battle: ATTR_BLK 5 ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 ; message box: pal 2 ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 ; enemy HP bar: pal 1 @@ -74,7 +74,7 @@ BlkPacket_Battle: ; 721b5 (1c:61b5) db $03,$0b,$00,$13,$07,$03 db $00 -BlkPacket_StatusScreen: ; 721fa (1c:61fa) +BlkPacket_StatusScreen: ATTR_BLK 1 ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 ; mon: pal 1, HP bar: pal 0 ds 8 @@ -84,7 +84,7 @@ BlkPacket_StatusScreen: ; 721fa (1c:61fa) db $01,$07,$13,$11,$00,$03 db $08,$00,$13,$06,$00,$00 -BlkPacket_Pokedex: ; 72222 (1c:6222) +BlkPacket_Pokedex: ATTR_BLK 1 ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 ; mon: pal 1, everything else: pal 0 ds 8 @@ -95,7 +95,7 @@ BlkPacket_Pokedex: ; 72222 (1c:6222) db $09,$08,$11,$00,$03,$09 db $01,$13,$11,$00,$00 -BlkPacket_Slots: ; 7224f (1c:624f) +BlkPacket_Slots: ATTR_BLK 5 ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1 ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 ; "2" rows: pal 2 @@ -110,7 +110,7 @@ BlkPacket_Slots: ; 7224f (1c:624f) db $03,$00,$0c,$13,$11,$00 db $00 -BlkPacket_Titlescreen: ; 7228e (1c:628e) +BlkPacket_Titlescreen: ATTR_BLK 3 ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 ; pokemon logo: pal 0 ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 ; version text: pal 1 @@ -122,7 +122,7 @@ BlkPacket_Titlescreen: ; 7228e (1c:628e) db $03,$00,$0a,$13,$11,$02 db $00 -BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1) +BlkPacket_NidorinoIntro: ATTR_BLK 3 ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1 ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 ; letterbox: pal 0 @@ -134,7 +134,7 @@ BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1) db $03,$00,$0e,$13,$11,$01 db $00 -BlkPacket_PartyMenu: ; 722f4 (1c:62f4) +BlkPacket_PartyMenu: ATTR_BLK 7 ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 ; mon sprites: pal 0, everything else: pal 1 ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 ; HP bar 0: pal set dynamically @@ -156,7 +156,7 @@ BlkPacket_PartyMenu: ; 722f4 (1c:62f4) db $0c,$08,$12,$09,$00,$03 db $0c,$0a,$12,$0b,$00,$00 -BlkPacket_TrainerCard: ; 72360 (1c:6360) +BlkPacket_TrainerCard: ATTR_BLK 10 ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 ; Boulder Badge ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 ; Cascade Badge @@ -182,7 +182,7 @@ BlkPacket_TrainerCard: ; 72360 (1c:6360) db $03,$0f,$0f,$10,$10,$01 db $00 -BlkPacket_GameFreakIntro: ; 723dd (1c:63dd) +BlkPacket_GameFreakIntro: ATTR_BLK 3 ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 ; falling stars (left): pal 1, GameFreak logo: pal 0 ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 ; falling stars (middle): pal 2 diff --git a/data/slot_machine_wheels.asm b/data/slot_machine_wheels.asm index 8f300152..88a89822 100755 --- a/data/slot_machine_wheels.asm +++ b/data/slot_machine_wheels.asm @@ -1,4 +1,4 @@ -SlotMachineWheel1: ; 379e5 (d:79e5) +SlotMachineWheel1: dw SLOTS7 dw SLOTSMOUSE dw SLOTSFISH @@ -18,7 +18,7 @@ SlotMachineWheel1: ; 379e5 (d:79e5) dw SLOTSMOUSE dw SLOTSFISH -SlotMachineWheel2: ; 37a09 (d:7a09) +SlotMachineWheel2: dw SLOTS7 dw SLOTSFISH dw SLOTSCHERRY @@ -38,7 +38,7 @@ SlotMachineWheel2: ; 37a09 (d:7a09) dw SLOTSFISH dw SLOTSCHERRY -SlotMachineWheel3: ; 37a2d (d:7a2d) +SlotMachineWheel3: dw SLOTS7 dw SLOTSBIRD dw SLOTSFISH diff --git a/data/special_warps.asm b/data/special_warps.asm index b8baccfb..27837109 100755 --- a/data/special_warps.asm +++ b/data/special_warps.asm @@ -1,7 +1,7 @@ ; Format: (size 2 bytes) ; 00: target map ID ; 01: which dungeon warp in the source map was used -DungeonWarpList: ; 63bf (1:63bf) +DungeonWarpList: db SEAFOAM_ISLANDS_2,$01 db SEAFOAM_ISLANDS_2,$02 db SEAFOAM_ISLANDS_3,$01 @@ -16,7 +16,7 @@ DungeonWarpList: ; 63bf (1:63bf) db MANSION_2,$03 db $FF -DungeonWarpData: ; 63d8 (1:63d8) +DungeonWarpData: FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,18 FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,23 FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,19 @@ -34,32 +34,32 @@ DungeonWarpData: ; 63d8 (1:63d8) ; db Map_id ; FLYWARP_DATA [Map Width][Y-pos][X-pos] ; db Tileset_id -FirstMapSpec: ; 6420 (1:6420) +FirstMapSpec: db REDS_HOUSE_2F FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3 db REDS_HOUSE_2 -TradeCenterSpec1: ; 6428 (1:6428) +TradeCenterSpec1: db TRADE_CENTER FLYWARP_DATA TRADE_CENTER_WIDTH,4,3 db CLUB -TradeCenterSpec2: ; 6430 (1:6430) +TradeCenterSpec2: db TRADE_CENTER FLYWARP_DATA TRADE_CENTER_WIDTH,4,6 db CLUB -ColosseumSpec1: ; 6438 (1:6438) +ColosseumSpec1: db COLOSSEUM FLYWARP_DATA COLOSSEUM_WIDTH,4,3 db CLUB -ColosseumSpec2: ; 6440 (1:6440) +ColosseumSpec2: db COLOSSEUM FLYWARP_DATA COLOSSEUM_WIDTH,4,6 db CLUB -FlyWarpDataPtr: ; 6448 (1:6448) +FlyWarpDataPtr: db PALLET_TOWN, 0 dw PalletTownFlyWarp db VIRIDIAN_CITY, 0 @@ -91,29 +91,29 @@ FlyWarpDataPtr: ; 6448 (1:6448) ; [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block] ; Macro Format: ; FLYWARP_DATA [Map Width][Y-pos][X-pos] -PalletTownFlyWarp: ; 647c (1:647c) +PalletTownFlyWarp: FLYWARP_DATA PALLET_TOWN_WIDTH, 6, 5 -ViridianCityFlyWarp: ; 6482 (1:6482) +ViridianCityFlyWarp: FLYWARP_DATA VIRIDIAN_CITY_WIDTH, 26, 23 -PewterCityFlyWarp: ; 6488 (1:6488) +PewterCityFlyWarp: FLYWARP_DATA PEWTER_CITY_WIDTH, 26, 13 -CeruleanCityFlyWarp: ; 648e (1:648e) +CeruleanCityFlyWarp: FLYWARP_DATA CERULEAN_CITY_WIDTH, 18, 19 -LavenderTownFlyWarp: ; 6494 (1:6494) +LavenderTownFlyWarp: FLYWARP_DATA LAVENDER_TOWN_WIDTH, 6, 3 -VermilionCityFlyWarp: ; 649a (1:649a) +VermilionCityFlyWarp: FLYWARP_DATA VERMILION_CITY_WIDTH, 4, 11 -CeladonCityFlyWarp: ; 64a0 (1:64a0) +CeladonCityFlyWarp: FLYWARP_DATA CELADON_CITY_WIDTH, 10, 41 -FuchsiaCityFlyWarp: ; 64a6 (1:64a6) +FuchsiaCityFlyWarp: FLYWARP_DATA FUCHSIA_CITY_WIDTH, 28, 19 -CinnabarIslandFlyWarp: ; 64ac (1:64ac) +CinnabarIslandFlyWarp: FLYWARP_DATA CINNABAR_ISLAND_WIDTH, 12, 11 -IndigoPlateauFlyWarp: ; 64b2 (1:64b2) +IndigoPlateauFlyWarp: FLYWARP_DATA INDIGO_PLATEAU_WIDTH, 6, 9 -SaffronCityFlyWarp: ; 64b8 (1:64b8) +SaffronCityFlyWarp: FLYWARP_DATA SAFFRON_CITY_WIDTH, 30, 9 -Route4FlyWarp: ; 64be (1:64be) +Route4FlyWarp: FLYWARP_DATA ROUTE_4_WIDTH, 6, 11 -Route10FlyWarp: ; 64c4 (1:64c4) +Route10FlyWarp: FLYWARP_DATA ROUTE_10_WIDTH, 20, 11 diff --git a/data/sprite_sets.asm b/data/sprite_sets.asm index c5e2d29e..5b0e1e00 100755 --- a/data/sprite_sets.asm +++ b/data/sprite_sets.asm @@ -1,4 +1,4 @@ -MapSpriteSets: ; 17a64 (5:7a64) +MapSpriteSets: db $01 ; PALLET_TOWN db $01 ; VIRIDIAN_CITY db $02 ; PEWTER_CITY @@ -44,7 +44,7 @@ MapSpriteSets: ; 17a64 (5:7a64) ; 01: coordinate of dividing line ; 02: sprite set ID if in the West or North side ; 03: sprite set ID if in the East or South side -SplitMapSpriteSets: ; 17a89 (5:7a89) +SplitMapSpriteSets: db $02,$25,$02,$01 ; $f1 db $02,$32,$02,$03 ; $f2 db $01,$39,$04,$08 ; $f3 @@ -58,7 +58,7 @@ SplitMapSpriteSets: ; 17a89 (5:7a89) db $01,$11,$05,$07 ; $fb db $01,$03,$07,$03 ; $fc -SpriteSets: ; 17ab9 (5:7ab9) +SpriteSets: ; sprite set $01 db SPRITE_BLUE db SPRITE_BUG_CATCHER @@ -189,7 +189,7 @@ SpriteSets: ; 17ab9 (5:7ab9) db SPRITE_BALL db SPRITE_OMANYTE -SpriteSheetPointerTable: ; 17b27 (5:7b27) +SpriteSheetPointerTable: ; SPRITE_RED dw RedSprite db $c0 ; byte count diff --git a/data/super_palettes.asm b/data/super_palettes.asm index c1afb003..97f1d8ec 100755 --- a/data/super_palettes.asm +++ b/data/super_palettes.asm @@ -1,5 +1,5 @@ ; palettes for overworlds, title screen, monsters -SuperPalettes: ; 72660 (1c:6660) +SuperPalettes: RGB 31,29,31 ; PAL_ROUTE RGB 21,28,11 RGB 20,26,31 diff --git a/data/super_rod.asm b/data/super_rod.asm index 2b0646fc..93ea992b 100755 --- a/data/super_rod.asm +++ b/data/super_rod.asm @@ -1,6 +1,6 @@ ; super rod data ; format: map, pointer to fishing group -SuperRodData: ; e919 (3:6919) +SuperRodData: dbw PALLET_TOWN, FishingGroup1 dbw VIRIDIAN_CITY, FishingGroup1 dbw CERULEAN_CITY, FishingGroup3 @@ -38,61 +38,61 @@ SuperRodData: ; e919 (3:6919) ; fishing groups ; number of monsters, followed by level/monster pairs -FishingGroup1: ; e97d (3:697d) +FishingGroup1: db 2 db 15,TENTACOOL db 15,POLIWAG -FishingGroup2: ; e982 (3:6982) +FishingGroup2: db 2 db 15,GOLDEEN db 15,POLIWAG -FishingGroup3: ; e987 (3:6987) +FishingGroup3: db 3 db 15,PSYDUCK db 15,GOLDEEN db 15,KRABBY -FishingGroup4: ; e98e (3:698e) +FishingGroup4: db 2 db 15,KRABBY db 15,SHELLDER -FishingGroup5: ; e993 (3:6993) +FishingGroup5: db 2 db 23,POLIWHIRL db 15,SLOWPOKE -FishingGroup6: ; e998 (3:6998) +FishingGroup6: db 4 db 15,DRATINI db 15,KRABBY db 15,PSYDUCK db 15,SLOWPOKE -FishingGroup7: ; e9a1 (3:69a1) +FishingGroup7: db 4 db 5,TENTACOOL db 15,KRABBY db 15,GOLDEEN db 15,MAGIKARP -FishingGroup8: ; e9aa (3:69aa) +FishingGroup8: db 4 db 15,STARYU db 15,HORSEA db 15,SHELLDER db 15,GOLDEEN -FishingGroup9: ; e9b3 (3:69b3) +FishingGroup9: db 4 db 23,SLOWBRO db 23,SEAKING db 23,KINGLER db 23,SEADRA -FishingGroup10: ; e9bc (3:69bc) +FishingGroup10: db 4 db 23,SEAKING db 15,KRABBY diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 84cfaffd..d8e0d9b4 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,4 +1,4 @@ -Tilesets: ; c7be (3:47be) +Tilesets: tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR diff --git a/data/title_mons.asm b/data/title_mons.asm index abcf1bb4..c5d94301 100755 --- a/data/title_mons.asm +++ b/data/title_mons.asm @@ -1,4 +1,4 @@ -TitleMons: ; 4588 (1:4588) +TitleMons: ; mons on the title screen are randomly chosen from here IF DEF(_RED) db CHARMANDER diff --git a/data/tm_prices.asm b/data/tm_prices.asm index 89fdb8e9..ccc8be05 100755 --- a/data/tm_prices.asm +++ b/data/tm_prices.asm @@ -1,4 +1,4 @@ -TechnicalMachinePrices: ; 7bfa7 (1e:7fa7) +TechnicalMachinePrices: ; In thousands (nybbles). dn 3, 2 ; TM_01, TM_02 dn 2, 1 ; TM_03, TM_04 diff --git a/data/tms.asm b/data/tms.asm index 23630691..23c1685e 100755 --- a/data/tms.asm +++ b/data/tms.asm @@ -1,4 +1,4 @@ -TechnicalMachines: ; 13773 (4:7773) +TechnicalMachines: db MEGA_PUNCH db RAZOR_WIND db SWORDS_DANCE diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index ee2828ca..abf584de 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -1,4 +1,4 @@ -ExternalMapEntries: ; 71313 (1c:5313) +ExternalMapEntries: EMAP $2,$B,PalletTownName EMAP $2,$8,ViridianCityName EMAP $2,$3,PewterCityName @@ -37,7 +37,7 @@ ExternalMapEntries: ; 71313 (1c:5313) EMAP $A,$1,Route24Name EMAP $B,$0,Route25Name -InternalMapEntries: ; 71382 (1c:5382) +InternalMapEntries: IMAP OAKS_LAB, $2,$B,PalletTownName IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName IMAP VIRIDIAN_FOREST_ENTRANCE, $2,$6,Route2Name diff --git a/data/town_map_order.asm b/data/town_map_order.asm index 4fb4f33b..10131a31 100755 --- a/data/town_map_order.asm +++ b/data/town_map_order.asm @@ -1,4 +1,4 @@ -TownMapOrder: ; 70f11 (1c:4f11) +TownMapOrder: db PALLET_TOWN db ROUTE_1 db VIRIDIAN_CITY diff --git a/data/trades.asm b/data/trades.asm index e7f71233..cf0fcbfd 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,4 +1,4 @@ -TradeMons: ; 71b7b (1c:5b7b) +TradeMons: ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" db ABRA, MR_MIME, 0,"MARCEL@@@@@" diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm index a42364af..2e7b52a5 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -1,4 +1,4 @@ -LoneMoves: ; 39d22 (e:5d22) +LoneMoves: ; these are used for gym leaders. ; this is not automatic! you have to write the number you want to wLoneAttackNo ; first. e.g., erika's script writes 4 to wLoneAttackNo to get mega drain, @@ -16,7 +16,7 @@ LoneMoves: ; 39d22 (e:5d22) db 3,FIRE_BLAST db 4,FISSURE -TeamMoves: ; 39d32 (e:5d32) +TeamMoves: ; these are used for elite four. ; this is automatic, based on trainer class. ; don't be confused by LoneMoves above, the two data structures are diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index 9bc80da1..c186dd00 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -1,4 +1,4 @@ -TrainerDataPointers: ; 39d3b (e:5d3b) +TrainerDataPointers: dw YoungsterData dw BugCatcherData dw LassData diff --git a/data/trainer_types.asm b/data/trainer_types.asm index bc94015c..cc7ca605 100755 --- a/data/trainer_types.asm +++ b/data/trainer_types.asm @@ -1,11 +1,11 @@ -FemaleTrainerList:: ; 3434 (0:3434) +FemaleTrainerList:: db OPP_LASS db OPP_JR_TRAINER_F db OPP_BEAUTY db OPP_COOLTRAINER_F db $FF -EvilTrainerList:: ; 3439 (0:3439) +EvilTrainerList:: db OPP_JUGGLER_X db OPP_GAMBLER db OPP_ROCKER diff --git a/data/type_effects.asm b/data/type_effects.asm index b3207c84..1321a3d9 100755 --- a/data/type_effects.asm +++ b/data/type_effects.asm @@ -1,4 +1,4 @@ -TypeEffects: ; 3e474 (f:6474) +TypeEffects: ; format: attacking type, defending type, damage multiplier ; the multiplier is a (decimal) fixed-point number: ; 20 is ×2.0 diff --git a/data/warp_tile_ids.asm b/data/warp_tile_ids.asm index aa725d00..6fd326cc 100755 --- a/data/warp_tile_ids.asm +++ b/data/warp_tile_ids.asm @@ -1,4 +1,4 @@ -WarpTileIDPointers: ; c4cc (3:44cc) +WarpTileIDPointers: dw OverworldWarpTileIDs dw RedsHouse1WarpTileIDs dw MartWarpTileIDs @@ -24,62 +24,62 @@ WarpTileIDPointers: ; c4cc (3:44cc) dw FacilityWarpTileIDs dw PlateauWarpTileIDs -OverworldWarpTileIDs: ; c4fc (3:44fc) +OverworldWarpTileIDs: db $1B,$58,$FF -ForestGateWarpTileIDs: ; c4ff (3:44ff) -MuseumWarpTileIDs: ; c4ff (3:44ff) -GateWarpTileIDs: ; c4ff (3:44ff) +ForestGateWarpTileIDs: +MuseumWarpTileIDs: +GateWarpTileIDs: db $3B -RedsHouse1WarpTileIDs: ; c500 (3:4500) -RedsHouse2WarpTileIDs: ; c500 (3:4500) +RedsHouse1WarpTileIDs: +RedsHouse2WarpTileIDs: db $1A,$1C,$FF -MartWarpTileIDs: ; c503 (3:4503) -PokecenterWarpTileIDs: ; c503 (3:4503) +MartWarpTileIDs: +PokecenterWarpTileIDs: db $5E,$FF -ForestWarpTileIDs: ; c505 (3:4505) +ForestWarpTileIDs: db $5A,$5C,$3A,$FF -DojoWarpTileIDs: ; c509 (3:4509) -GymWarpTileIDs: ; c509 (3:4509) +DojoWarpTileIDs: +GymWarpTileIDs: db $4A,$FF -HouseWarpTileIDs: ; c50b (3:450b) +HouseWarpTileIDs: db $54,$5C,$32,$FF -ShipWarpTileIDs: ; c50f (3:450f) +ShipWarpTileIDs: db $37,$39,$1E,$4A,$FF -InteriorWarpTileIDs: ; c514 (3:4514) +InteriorWarpTileIDs: db $15,$55,$04,$FF -CavernWarpTileIDs: ; c518 (3:4518) +CavernWarpTileIDs: db $18,$1A,$22,$FF -LobbyWarpTileIDs: ; c51c (3:451c) +LobbyWarpTileIDs: db $1A,$1C,$38,$FF -MansionWarpTileIDs: ; c520 (3:4520) +MansionWarpTileIDs: db $1A,$1C,$53,$FF -LabWarpTileIDs: ; c524 (3:4524) +LabWarpTileIDs: db $34,$FF -FacilityWarpTileIDs: ; c526 (3:4526) +FacilityWarpTileIDs: db $43,$58,$20 -CemeteryWarpTileIDs: ; c529 (3:4529) +CemeteryWarpTileIDs: db $1B -UndergroundWarpTileIDs: ; c52a (3:452a) +UndergroundWarpTileIDs: db $13,$FF -PlateauWarpTileIDs: ; c52c (3:452c) +PlateauWarpTileIDs: db $1B,$3B -ShipPortWarpTileIDs: ; c52e (3:452e) -ClubWarpTileIDs: ; c52e (3:452e) +ShipPortWarpTileIDs: +ClubWarpTileIDs: db $FF diff --git a/data/wild_mons.asm b/data/wild_mons.asm index 482405e3..a4265565 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -1,4 +1,4 @@ -WildDataPointers: ; ceeb (3:4eeb) +WildDataPointers: dw NoMons ; PALLET_TOWN dw NoMons ; VIRIDIAN_CITY dw NoMons ; PEWTER_CITY diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index e00fc57d..a17d2e51 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -1,4 +1,4 @@ -HallOfFamePC: ; 7405c (1d:405c) +HallOfFamePC: callba AnimateHallOfFame call ClearScreen ld c, 100 @@ -33,7 +33,7 @@ HallOfFamePC: ; 7405c (1d:405c) ld [wNumCreditsMonsDisplayed], a jp Credits -FadeInCreditsText: ; 740ba (1d:40ba) +FadeInCreditsText: ld hl, HoFGBPalettes ld b, 4 .asm_740bf @@ -45,7 +45,7 @@ FadeInCreditsText: ; 740ba (1d:40ba) jr nz, .asm_740bf ret -DisplayCreditsMon: ; 740cb (1d:40cb) +DisplayCreditsMon: xor a ld [H_AUTOBGTRANSFERENABLED],a call SaveScreenTilesToBuffer1 @@ -106,7 +106,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) INCLUDE "data/credit_mons.asm" -ScrollCreditsMonLeft: ; 74140 (1d:4140) +ScrollCreditsMonLeft: ld h, b ld l, $20 call ScrollCreditsMonLeft_SetSCX @@ -118,7 +118,7 @@ ScrollCreditsMonLeft: ; 74140 (1d:4140) ld b, a ret -ScrollCreditsMonLeft_SetSCX: ; 74152 (1d:4152) +ScrollCreditsMonLeft_SetSCX: ld a, [rLY] cp l jr nz, ScrollCreditsMonLeft_SetSCX @@ -130,13 +130,13 @@ ScrollCreditsMonLeft_SetSCX: ; 74152 (1d:4152) jr z, .loop ret -HoFGBPalettes: ; 74160 (1d:4160) +HoFGBPalettes: db %11000000 db %11010000 db %11100000 db %11110000 -CreditsCopyTileMapToVRAM: ; 74164 (1d:4164) +CreditsCopyTileMapToVRAM: ld a, l ld [H_AUTOBGTRANSFERDEST], a ld a, h @@ -145,7 +145,7 @@ CreditsCopyTileMapToVRAM: ; 74164 (1d:4164) ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -ZeroMemory: ; 74171 (1d:4171) +ZeroMemory: ; zero bc bytes at hl ld [hl], 0 inc hl @@ -156,18 +156,18 @@ ZeroMemory: ; 74171 (1d:4171) jr nz, ZeroMemory ret -FillFourRowsWithBlack: ; 7417b (1d:417b) +FillFourRowsWithBlack: ld bc, SCREEN_WIDTH * 4 ld a, $7e jp FillMemory -FillMiddleOfScreenWithWhite: ; 74183 (1d:4183) +FillMiddleOfScreenWithWhite: coord hl, 0, 4 ld bc, SCREEN_WIDTH * 10 ld a, " " jp FillMemory -Credits: ; 7418e (1d:418e) +Credits: ld de, CreditsOrder push de .nextCreditsScreen @@ -256,7 +256,7 @@ Credits: ; 7418e (1d:418e) call PlaceString jp FadeInCreditsText -TheEndTextString: ; 74229 (1d:4229) +TheEndTextString: ; "T H E E N D" db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@" db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@" diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index be8d2b18..ea5738bc 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1,6 +1,6 @@ ; Draws a "frame block". Frame blocks are blocks of tiles that are put ; together to form frames in battle animations. -DrawFrameBlock: ; 78000 (1e:4000) +DrawFrameBlock: ld l,c ld h,b ld a,[hli] @@ -161,7 +161,7 @@ DrawFrameBlock: ; 78000 (1e:4000) .done ret -PlayAnimation: ; 780f1 (1e:40f1) +PlayAnimation: xor a ld [$FF8B],a ; it looks like nothing reads this ld [wSubAnimTransform],a @@ -256,7 +256,7 @@ PlayAnimation: ; 780f1 (1e:40f1) .AnimationOver ; 417B ret -LoadSubanimation: ; 7817c (1e:417c) +LoadSubanimation: ld a,[wSubAnimAddrPtr + 1] ld h,a ld a,[wSubAnimAddrPtr] @@ -306,7 +306,7 @@ LoadSubanimation: ; 7817c (1e:417c) ; called if the subanimation type is not 5 ; sets the transform to 0 (i.e. no transform) if it's the player's turn ; sets the transform to the subanimation type if it's the enemy's turn -GetSubanimationTransform1: ; 781c2 (1e:41c2) +GetSubanimationTransform1: ld b,a ld a,[H_WHOSETURN] and a @@ -318,7 +318,7 @@ GetSubanimationTransform1: ; 781c2 (1e:41c2) ; called if the subanimation type is 5 ; sets the transform to 2 (i.e. horizontal and vertical flip) if it's the player's turn ; sets the transform to 0 (i.e. no transform) if it's the enemy's turn -GetSubanimationTransform2: ; 781ca (1e:41ca) +GetSubanimationTransform2: ld a,[H_WHOSETURN] and a ld a,2 << 5 @@ -327,7 +327,7 @@ GetSubanimationTransform2: ; 781ca (1e:41ca) ret ; loads tile patterns for battle animations -LoadAnimationTileset: ; 781d2 (1e:41d2) +LoadAnimationTileset: ld a,[wWhichBattleAnimTileset] add a add a @@ -347,7 +347,7 @@ LoadAnimationTileset: ; 781d2 (1e:41d2) ld c,a ; number of tiles jp CopyVideoData ; load tileset -AnimationTilesetPointers: ; 781f2 (1e:41f2) +AnimationTilesetPointers: db 79 ; number of tiles dw AnimationTileset1 db $FF @@ -360,13 +360,13 @@ AnimationTilesetPointers: ; 781f2 (1e:41f2) dw AnimationTileset1 db $FF -AnimationTileset1: ; 781fe (1e:41fe) +AnimationTileset1: INCBIN "gfx/attack_anim_1.2bpp" -AnimationTileset2: ; 786ee (1e:46ee) +AnimationTileset2: INCBIN "gfx/attack_anim_2.2bpp" -SlotMachineTiles2: ; 78bde (1e:4bde) +SlotMachineTiles2: IF DEF(_RED) INCBIN "gfx/red/slotmachine2.2bpp" ENDC @@ -374,7 +374,7 @@ IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine2.2bpp" ENDC -MoveAnimation: ; 78d5e (1e:4d5e) +MoveAnimation: push hl push de push bc @@ -419,7 +419,7 @@ MoveAnimation: ; 78d5e (1e:4d5e) pop hl ret -ShareMoveAnimations: ; 78da6 (1e:4da6) +ShareMoveAnimations: ; some moves just reuse animations from status conditions ld a,[H_WHOSETURN] and a @@ -442,7 +442,7 @@ ShareMoveAnimations: ; 78da6 (1e:4da6) ld [wAnimationID],a ret -PlayApplyingAttackAnimation: ; 78dbd (1e:4dbd) +PlayApplyingAttackAnimation: ; Generic animation that shows after the move's individual animation ; Different animation depending on whether the move has an additional effect and on whose turn it is ld a,[wAnimationType] @@ -459,7 +459,7 @@ PlayApplyingAttackAnimation: ; 78dbd (1e:4dbd) ld l,a jp [hl] -AnimationTypePointerTable: ; 78dcf (1e:4dcf) +AnimationTypePointerTable: dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect dw ShakeScreenHorizontallyHeavy ; enemy mon has used a damaging move with a side effect dw ShakeScreenHorizontallySlow ; enemy mon has used a non-damaging move @@ -467,33 +467,33 @@ AnimationTypePointerTable: ; 78dcf (1e:4dcf) dw ShakeScreenHorizontallyLight ; player mon has used a damaging move with a side effect dw ShakeScreenHorizontallySlow2 ; player mon has used a non-damaging move -ShakeScreenVertically: ; 78ddb (1e:4ddb) +ShakeScreenVertically: call PlayApplyingAttackSound ld b, 8 jp AnimationShakeScreenVertically -ShakeScreenHorizontallyHeavy: ; 78de3 (1e:4de3) +ShakeScreenHorizontallyHeavy: call PlayApplyingAttackSound ld b, 8 jp AnimationShakeScreenHorizontallyFast -ShakeScreenHorizontallySlow: ; 78deb (1e:4deb) +ShakeScreenHorizontallySlow: lb bc, 6, 2 jr AnimationShakeScreenHorizontallySlow -BlinkEnemyMonSprite: ; 78df0 (1e:4df0) +BlinkEnemyMonSprite: call PlayApplyingAttackSound jp AnimationBlinkEnemyMon -ShakeScreenHorizontallyLight: ; 78df6 (1e:4df6) +ShakeScreenHorizontallyLight: call PlayApplyingAttackSound ld b, 2 jp AnimationShakeScreenHorizontallyFast -ShakeScreenHorizontallySlow2: ; 78dfe (1e:4dfe) +ShakeScreenHorizontallySlow2: lb bc, 3, 2 -AnimationShakeScreenHorizontallySlow: ; 78e01 (1e:4e01) +AnimationShakeScreenHorizontallySlow: push bc push bc .loop1 @@ -518,7 +518,7 @@ AnimationShakeScreenHorizontallySlow: ; 78e01 (1e:4e01) jr nz, AnimationShakeScreenHorizontallySlow ret -SetAnimationPalette: ; 78e23 (1e:4e23) +SetAnimationPalette: ld a, [wOnSGB] and a ld a, $e4 @@ -546,7 +546,7 @@ SetAnimationPalette: ; 78e23 (1e:4e23) ld [rOBP1], a ret -PlaySubanimation: ; 78e53 (1e:4e53) +PlaySubanimation: ld a,[wAnimSoundID] cp a,$FF jr z,.skipPlayingSound @@ -612,7 +612,7 @@ PlaySubanimation: ; 78e53 (1e:4e53) ld [wSubAnimSubEntryAddr],a jp .loop -AnimationCleanOAM: ; 78ec8 (1e:4ec8) +AnimationCleanOAM: push hl push de push bc @@ -627,7 +627,7 @@ AnimationCleanOAM: ; 78ec8 (1e:4ec8) ; this runs after each frame block is drawn in a subanimation ; it runs a particular special effect based on the animation ID -DoSpecialEffectByAnimationId: ; 78ed7 (1e:4ed7) +DoSpecialEffectByAnimationId: push hl push de push bc @@ -650,7 +650,7 @@ DoSpecialEffectByAnimationId: ; 78ed7 (1e:4ed7) ret ; Format: Animation ID (1 byte), Address (2 bytes) -AnimationIdSpecialEffects: ; 78ef5 (1e:4ef5) +AnimationIdSpecialEffects: db MEGA_PUNCH dw AnimationFlashScreen @@ -725,7 +725,7 @@ AnimationIdSpecialEffects: ; 78ef5 (1e:4ef5) db $FF ; terminator -DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) +DoBallTossSpecialEffects: ld a,[wcf91] cp a,3 ; is it a Master Ball or Ultra Ball? jr nc,.skipFlashingEffect @@ -779,7 +779,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) ld [wSubAnimCounter],a ret -DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) +DoBallShakeSpecialEffects: ld a,[wSubAnimCounter] cp a,4 ; is it the beginning of a shake? jr nz,.skipPlayingSound @@ -813,14 +813,14 @@ DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) ret ; plays a sound after the second frame of the poof animation -DoPoofSpecialEffects: ; 78fce (1e:4fce) +DoPoofSpecialEffects: ld a,[wSubAnimCounter] cp a,5 ret nz ld a,SFX_BALL_POOF jp PlaySound -DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9) +DoRockSlideSpecialEffects: ld a,[wSubAnimCounter] cp a,12 ret nc @@ -836,21 +836,21 @@ DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9) ld b,1 predef_jump PredefShakeScreenVertically ; shake vertically -FlashScreenEveryEightFrameBlocks: ; 78ff7 (1e:4ff7) +FlashScreenEveryEightFrameBlocks: ld a,[wSubAnimCounter] and a,7 ; is the subanimation counter exactly 8? call z,AnimationFlashScreen ; if so, flash the screen ret ; flashes the screen if the subanimation counter is divisible by 4 -FlashScreenEveryFourFrameBlocks: ; 79000 (1e:5000) +FlashScreenEveryFourFrameBlocks: ld a,[wSubAnimCounter] and a,3 call z,AnimationFlashScreen ret ; used for Explosion and Selfdestruct -DoExplodeSpecialEffects: ; 79009 (1e:5009) +DoExplodeSpecialEffects: ld a,[wSubAnimCounter] cp a,1 ; is it the end of the subanimation? jr nz,FlashScreenEveryFourFrameBlocks @@ -859,7 +859,7 @@ DoExplodeSpecialEffects: ; 79009 (1e:5009) jp AnimationHideMonPic ; make pokemon disappear ; flashes the screen when subanimation counter is 1 modulo 4 -DoBlizzardSpecialEffects: ; 79016 (1e:5016) +DoBlizzardSpecialEffects: ld a,[wSubAnimCounter] cp a,13 jp z,AnimationFlashScreen @@ -873,7 +873,7 @@ DoBlizzardSpecialEffects: ; 79016 (1e:5016) ; flashes the screen at 3 points in the subanimation ; unused -FlashScreenUnused: ; 7902e (1e:502e) +FlashScreenUnused: ld a,[wSubAnimCounter] cp a,14 jp z,AnimationFlashScreen @@ -884,7 +884,7 @@ FlashScreenUnused: ; 7902e (1e:502e) ret ; function to make the pokemon disappear at the beginning of the animation -TradeHidePokemon: ; 79041 (1e:5041) +TradeHidePokemon: ld a,[wSubAnimCounter] cp a,6 ret nz @@ -892,7 +892,7 @@ TradeHidePokemon: ; 79041 (1e:5041) jp ClearMonPicFromTileMap ; make pokemon disappear ; function to make a shaking pokeball jump up at the end of the animation -TradeShakePokeball: ; 7904c (1e:504c) +TradeShakePokeball: ld a,[wSubAnimCounter] cp a,1 ret nz @@ -921,7 +921,7 @@ TradeShakePokeball: ; 7904c (1e:504c) ld a,SFX_TRADE_MACHINE jp PlaySound -BallMoveDistances1: ; 79078 (1e:5078) +BallMoveDistances1: db -12,-12,-8 db $ff ; terminator @@ -962,13 +962,13 @@ TradeJumpPokeball: ; 507C pop de jr .loop -BallMoveDistances2: ; 790b3 (1e:50b3) +BallMoveDistances2: db 11,12,-12,-7,7,12,-8,8 db $ff ; terminator ; this function copies the current musical note graphic ; so that there are two musical notes flying towards the defending pokemon -DoGrowlSpecialEffects: ; 790bc (1e:50bc) +DoGrowlSpecialEffects: ld hl,wOAMBuffer ; OAM buffer ld de,wOAMBuffer + $10 ld bc,$10 @@ -979,14 +979,14 @@ DoGrowlSpecialEffects: ; 790bc (1e:50bc) ret ; this is associated with Tail Whip, but Tail Whip doesn't use any subanimations -TailWhipAnimationUnused: ; 790d0 (1e:50d0) +TailWhipAnimationUnused: ld a,1 ld [wSubAnimCounter],a ld c,20 jp DelayFrames ; Format: Special Effect ID (1 byte), Address (2 bytes) -SpecialEffectPointers: ; 790da (1e:50da) +SpecialEffectPointers: db SE_DARK_SCREEN_FLASH ; $FE dw AnimationFlashScreen db SE_DARK_SCREEN_PALETTE ; $FD @@ -1067,13 +1067,13 @@ SpecialEffectPointers: ; 790da (1e:50da) dw AnimationWavyScreen db $FF -AnimationDelay10: ; 79150 (1e:5150) +AnimationDelay10: ld c,10 jp DelayFrames ; calls a function with the turn flipped from player to enemy or vice versa ; input - hl - address of function to call -CallWithTurnFlipped: ; 79155 (1e:5155) +CallWithTurnFlipped: ld a,[H_WHOSETURN] push af xor a,1 @@ -1087,7 +1087,7 @@ CallWithTurnFlipped: ; 79155 (1e:5155) ret ; flashes the screen for an extended period (48 frames) -AnimationFlashScreenLong: ; 79165 (1e:5165) +AnimationFlashScreenLong: ld a,3 ; cycle through the palettes 3 times ld [wFlashScreenLongCounter],a ld a,[wOnSGB] ; running on SGB? @@ -1113,7 +1113,7 @@ AnimationFlashScreenLong: ; 79165 (1e:5165) ret ; BG palettes -FlashScreenLongMonochrome: ; 7918e (1e:518e) +FlashScreenLongMonochrome: db %11111001 ; 3, 3, 2, 1 db %11111110 ; 3, 3, 3, 2 db %11111111 ; 3, 3, 3, 3 @@ -1129,7 +1129,7 @@ FlashScreenLongMonochrome: ; 7918e (1e:518e) db $01 ; terminator ; BG palettes -FlashScreenLongSGB: ; 7919b (1e:519b) +FlashScreenLongSGB: db %11111000 ; 3, 3, 2, 0 db %11111100 ; 3, 3, 3, 0 db %11111111 ; 3, 3, 3, 3 @@ -1146,7 +1146,7 @@ FlashScreenLongSGB: ; 7919b (1e:519b) ; causes a delay of 2 frames for the first cycle ; causes a delay of 1 frame for the second and third cycles -FlashScreenLongDelay: ; 791a8 (1e:51a8) +FlashScreenLongDelay: ld a,[wFlashScreenLongCounter] cp a,4 ; never true since [wFlashScreenLongCounter] starts at 3 ld c,4 @@ -1159,7 +1159,7 @@ FlashScreenLongDelay: ; 791a8 (1e:51a8) .delayFrames jp DelayFrames -AnimationFlashScreen: ; 791be (1e:51be) +AnimationFlashScreen: ld a,[rBGP] push af ; save initial palette ld a,%00011011 ; 0, 1, 2, 3 (inverted colors) @@ -1174,42 +1174,42 @@ AnimationFlashScreen: ; 791be (1e:51be) ld [rBGP],a ; restore initial palette ret -AnimationDarkScreenPalette: ; 791d6 (1e:51d6) +AnimationDarkScreenPalette: ; Changes the screen's palette to a dark palette. lb bc, $6f, $6f jr SetAnimationBGPalette -AnimationDarkenMonPalette: ; 791db (1e:51db) +AnimationDarkenMonPalette: ; Darkens the mon sprite's palette. lb bc, $f9, $f4 jr SetAnimationBGPalette -AnimationUnusedPalette1: ; 791e0 (1e:51e0) +AnimationUnusedPalette1: lb bc, $fe, $f8 jr SetAnimationBGPalette -AnimationUnusedPalette2: ; 791e5 (1e:51e5) +AnimationUnusedPalette2: lb bc, $ff, $ff jr SetAnimationBGPalette -AnimationResetScreenPalette: ; 791ea (1e:51ea) +AnimationResetScreenPalette: ; Restores the screen's palette to the normal palette. lb bc, $e4, $e4 jr SetAnimationBGPalette -AnimationUnusedPalette3: ; 791ef (1e:51ef) +AnimationUnusedPalette3: lb bc, $00, $00 jr SetAnimationBGPalette -AnimationLightScreenPalette: ; 791f4 (1e:51f4) +AnimationLightScreenPalette: ; Changes the screen to use a palette with light colors. lb bc, $90, $90 jr SetAnimationBGPalette -AnimationUnusedPalette4: ; 791f9 (1e:51f9) +AnimationUnusedPalette4: lb bc, $40, $40 -SetAnimationBGPalette: ; 791fc (1e:51fc) +SetAnimationBGPalette: ld a, [wOnSGB] and a ld a, b @@ -1221,17 +1221,17 @@ SetAnimationBGPalette: ; 791fc (1e:51fc) ld b, $5 -AnimationShakeScreenVertically: ; 79209 (1e:5209) +AnimationShakeScreenVertically: predef_jump PredefShakeScreenVertically -AnimationShakeScreen: ; 7920e (1e:520e) +AnimationShakeScreen: ; Shakes the screen for a while. Used in Earthquake/Fissure/etc. animations. ld b, $8 -AnimationShakeScreenHorizontallyFast: ; 79210 (1e:5210) +AnimationShakeScreenHorizontallyFast: predef_jump PredefShakeScreenHorizontally -AnimationWaterDropletsEverywhere: ; 79215 (1e:5215) +AnimationWaterDropletsEverywhere: ; Draws water droplets all over the screen and makes them ; scroll. It's hard to describe, but it's the main animation ; in Surf/Mist/Toxic. @@ -1258,7 +1258,7 @@ AnimationWaterDropletsEverywhere: ; 79215 (1e:5215) jr nz, .loop ret -_AnimationWaterDroplets: ; 79246 (1e:5246) +_AnimationWaterDroplets: ld hl, wOAMBuffer .loop ld a, [wBaseCoordY] @@ -1284,7 +1284,7 @@ _AnimationWaterDroplets: ; 79246 (1e:5246) call AnimationCleanOAM jp DelayFrame -AnimationSlideMonUp: ; 7927a (1e:527a) +AnimationSlideMonUp: ; Slides the mon's sprite upwards. ld c, 7 ld a, [H_WHOSETURN] @@ -1300,7 +1300,7 @@ AnimationSlideMonUp: ; 7927a (1e:527a) ld [wSlideMonUpBottomRowLeftTile], a jp _AnimationSlideMonUp -AnimationSlideMonDown: ; 79297 (1e:5297) +AnimationSlideMonDown: ; Slides the mon's sprite down out of the screen. xor a call GetTileIDList @@ -1317,19 +1317,19 @@ AnimationSlideMonDown: ; 79297 (1e:5297) jr nz, .loop ret -AnimationSlideMonOff: ; 792af (1e:52af) +AnimationSlideMonOff: ; Slides the mon's sprite off the screen horizontally. ld e, 8 ld a, 3 ld [wSlideMonDelay], a jp _AnimationSlideMonOff -AnimationSlideEnemyMonOff: ; 792b9 (1e:52b9) +AnimationSlideEnemyMonOff: ; Slides the enemy mon off the screen horizontally. ld hl, AnimationSlideMonOff jp CallWithTurnFlipped -_AnimationSlideMonUp: ; 792bf (1e:52bf) +_AnimationSlideMonUp: push de push hl push bc @@ -1380,7 +1380,7 @@ _AnimationSlideMonUp: ; 792bf (1e:52bf) jr nz, _AnimationSlideMonUp ret -ShakeEnemyHUD_WritePlayerMonPicOAM: ; 792fd (1e:52fd) +ShakeEnemyHUD_WritePlayerMonPicOAM: ; Writes the OAM entries for a copy of the player mon's pic in OAM. ; The top 5 rows are reproduced in OAM, although only 2 are actually needed. ld a, $10 @@ -1408,7 +1408,7 @@ ShakeEnemyHUD_WritePlayerMonPicOAM: ; 792fd (1e:52fd) ld [wBaseCoordX], a jr .loop -BattleAnimWriteOAMEntry: ; 79329 (1e:5329) +BattleAnimWriteOAMEntry: ; Y coordinate = e (increased by 8 each call, before the write to OAM) ; X coordinate = [wBaseCoordX] ; tile = d @@ -1425,11 +1425,11 @@ BattleAnimWriteOAMEntry: ; 79329 (1e:5329) ld [hli], a ret -AdjustOAMBlockXPos: ; 79337 (1e:5337) +AdjustOAMBlockXPos: ld l, e ld h, d -AdjustOAMBlockXPos2: ; 79339 (1e:5339) +AdjustOAMBlockXPos2: ld de, 4 .loop ld a, [wCoordAdjustmentAmount] @@ -1449,11 +1449,11 @@ AdjustOAMBlockXPos2: ; 79339 (1e:5339) jr nz, .loop ret -AdjustOAMBlockYPos: ; 79350 (1e:5350) +AdjustOAMBlockYPos: ld l, e ld h, d -AdjustOAMBlockYPos2: ; 79352 (1e:5352) +AdjustOAMBlockYPos2: ld de, 4 .loop ld a, [wCoordAdjustmentAmount] @@ -1472,12 +1472,12 @@ AdjustOAMBlockYPos2: ; 79352 (1e:5352) jr nz, .loop ret -AnimationBlinkEnemyMon: ; 79369 (1e:5369) +AnimationBlinkEnemyMon: ; Make the enemy mon's sprite blink on and off for a second or two ld hl, AnimationBlinkMon jp CallWithTurnFlipped -AnimationBlinkMon: ; 7936f (1e:536f) +AnimationBlinkMon: ; Make the mon's sprite blink on and off for a second or two. push af ld c, 6 @@ -1495,7 +1495,7 @@ AnimationBlinkMon: ; 7936f (1e:536f) pop af ret -AnimationFlashMonPic: ; 79389 (1e:5389) +AnimationFlashMonPic: ; Flashes the mon's sprite on and off ld a, [wBattleMonSpecies] ld [wChangeMonPicPlayerTurnSpecies], a @@ -1503,25 +1503,25 @@ AnimationFlashMonPic: ; 79389 (1e:5389) ld [wChangeMonPicEnemyTurnSpecies], a jp ChangeMonPic -AnimationFlashEnemyMonPic: ; 79398 (1e:5398) +AnimationFlashEnemyMonPic: ; Flashes the enemy mon's sprite on and off ld hl, AnimationFlashMonPic jp CallWithTurnFlipped -AnimationShowMonPic: ; 7939e (1e:539e) +AnimationShowMonPic: xor a call GetTileIDList call GetMonSpriteTileMapPointerFromRowCount call CopyPicTiles jp Delay3 -AnimationShowEnemyMonPic: ; 793ab (1e:53ab) +AnimationShowEnemyMonPic: ; Shows the emenmy mon's front sprite. Used in animations like Seismic Toss ; to make the mon's sprite reappear after disappears offscreen. ld hl, AnimationShowMonPic jp CallWithTurnFlipped -AnimationShakeBackAndForth: ; 793b1 (1e:53b1) +AnimationShakeBackAndForth: ; Shakes the mon's sprite back and forth rapidly. This is used in Double Team. ; The mon's sprite disappears after this animation. ld a, [H_WHOSETURN] @@ -1568,7 +1568,7 @@ AnimationShakeBackAndForth: ; 793b1 (1e:53b1) jr nz, .loop ret -AnimationMoveMonHorizontally: ; 793f9 (1e:53f9) +AnimationMoveMonHorizontally: ; Shifts the mon's sprite horizontally to a fixed location. Used by lots of ; animations like Tackle/Body Slam. call AnimationHideMonPic @@ -1586,7 +1586,7 @@ AnimationMoveMonHorizontally: ; 793f9 (1e:53f9) ld c, 3 jp DelayFrames -AnimationResetMonPosition: ; 79415 (1e:5415) +AnimationResetMonPosition: ; Resets the mon's sprites to be located at the normal coordinates. ld a, [H_WHOSETURN] and a @@ -1597,7 +1597,7 @@ AnimationResetMonPosition: ; 79415 (1e:5415) call ClearMonPicFromTileMap jp AnimationShowMonPic -AnimationSpiralBallsInward: ; 79424 (1e:5424) +AnimationSpiralBallsInward: ; Creates an effect that looks like energy balls spiralling into the ; player mon's sprite. Used in Focus Energy, for example. ld a, [H_WHOSETURN] @@ -1651,7 +1651,7 @@ AnimationSpiralBallsInward: ; 79424 (1e:5424) call AnimationCleanOAM jp AnimationFlashScreen -SpiralBallAnimationCoordinates: ; 79476 (1e:5476) +SpiralBallAnimationCoordinates: ; y, x pairs ; This is the sequence of screen coordinates that the spiralling ; balls are positioned at. @@ -1678,7 +1678,7 @@ SpiralBallAnimationCoordinates: ; 79476 (1e:5476) db $50, $28 db $FF ; list terminator -AnimationSquishMonPic: ; 794a1 (1e:54a1) +AnimationSquishMonPic: ; Squishes the mon's sprite horizontally making it ; disappear. Used by Teleport/Sky Attack animations. ld c, 4 @@ -1709,7 +1709,7 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1) ld c, 2 jp DelayFrame -_AnimationSquishMonPic: ; 794d4 (1e:54d4) +_AnimationSquishMonPic: ld c, 7 .loop push bc @@ -1734,7 +1734,7 @@ _AnimationSquishMonPic: ; 794d4 (1e:54d4) jr nz, .loop jp Delay3 -AnimationShootBallsUpward: ; 794f9 (1e:54f9) +AnimationShootBallsUpward: ; Shoots one pillar of "energy" balls upwards. Used in Teleport/Sky Attack ; animations. ld a, [H_WHOSETURN] @@ -1753,7 +1753,7 @@ AnimationShootBallsUpward: ; 794f9 (1e:54f9) call _AnimationShootBallsUpward jp AnimationCleanOAM -_AnimationShootBallsUpward: ; 79517 (1e:5517) +_AnimationShootBallsUpward: push bc xor a ld [wWhichBattleAnimTileset], a @@ -1803,7 +1803,7 @@ _AnimationShootBallsUpward: ; 79517 (1e:5517) jr nz, .loop ret -AnimationShootManyBallsUpward: ; 79566 (1e:5566) +AnimationShootManyBallsUpward: ; Shoots several pillars of "energy" balls upward. ld a, [H_WHOSETURN] and a @@ -1827,19 +1827,19 @@ AnimationShootManyBallsUpward: ; 79566 (1e:5566) pop hl jr .loop -UpwardBallsAnimXCoordinatesPlayerTurn: ; 79591 (1e:5591) +UpwardBallsAnimXCoordinatesPlayerTurn: ; List of x coordinates for each pillar of "energy" balls in the ; AnimationShootManyBallsUpward animation. It's unused in the game. db $10, $40, $28, $18, $38, $30 db $FF ; list terminator -UpwardBallsAnimXCoordinatesEnemyTurn: ; 79598 (1e:5598) +UpwardBallsAnimXCoordinatesEnemyTurn: ; List of x coordinates for each pillar of "energy" balls in the ; AnimationShootManyBallsUpward animation. It's unused in the game. db $60, $90, $78, $68, $88, $80 db $FF ; list terminator -AnimationMinimizeMon: ; 7959f (1e:559f) +AnimationMinimizeMon: ; Changes the mon's sprite to a mini black sprite. Used by the ; Minimize animation. ld hl, wTempPic @@ -1863,10 +1863,10 @@ AnimationMinimizeMon: ; 7959f (1e:559f) call Delay3 jp AnimationShowMonPic -MinimizedMonSprite: ; 795c4 (1e:55c4) +MinimizedMonSprite: INCBIN "gfx/minimized_mon_sprite.1bpp" -AnimationSlideMonDownAndHide: ; 795c9 (1e:55c9) +AnimationSlideMonDownAndHide: ; Slides the mon's sprite down and disappears. Used in Acid Armor. ld a, $1 ld c, $2 @@ -1893,7 +1893,7 @@ AnimationSlideMonDownAndHide: ; 795c9 (1e:55c9) call FillMemory jp CopyTempPicToMonPic -_AnimationSlideMonOff: ; 795f8 (1e:55f8) +_AnimationSlideMonOff: ; Slides the mon's sprite off the screen horizontally by e tiles and waits ; [wSlideMonDelay] V-blanks each time the pic is slid by one tile. ld a, [H_WHOSETURN] @@ -1965,7 +1965,7 @@ _AnimationSlideMonOff: ; 795f8 (1e:55f8) ld a, " " ret -AnimationSlideMonHalfOff: ; 79645 (1e:5645) +AnimationSlideMonHalfOff: ; Slides the mon's sprite halfway off the screen. It's used in Softboiled. ld e, 4 ld a, 4 @@ -1973,7 +1973,7 @@ AnimationSlideMonHalfOff: ; 79645 (1e:5645) call _AnimationSlideMonOff jp Delay3 -CopyTempPicToMonPic: ; 79652 (1e:5652) +CopyTempPicToMonPic: ld a, [H_WHOSETURN] and a ld hl, vBackPic ; player turn @@ -1984,7 +1984,7 @@ CopyTempPicToMonPic: ; 79652 (1e:5652) ld bc, 7 * 7 jp CopyVideoData -AnimationWavyScreen: ; 79666 (1e:5666) +AnimationWavyScreen: ; used in Psywave/Psychic etc. ld hl, vBGMap0 call BattleAnimCopyTileMapToVRAM @@ -2025,7 +2025,7 @@ AnimationWavyScreen: ; 79666 (1e:5666) call BattleAnimCopyTileMapToVRAM ret -WavyScreen_SetSCX: ; 796ae (1e:56ae) +WavyScreen_SetSCX: ld a, [rSTAT] and $3 ; is it H-blank? jr nz, WavyScreen_SetSCX ; wait until it's H-blank @@ -2038,14 +2038,14 @@ WavyScreen_SetSCX: ; 796ae (1e:56ae) ld hl, WavyScreenLineOffsets ; go back to the beginning if so ret -WavyScreenLineOffsets: ; 796bf (1e:56bf) +WavyScreenLineOffsets: ; Sequence of horizontal line pixel offsets for the wavy screen animation. ; This sequence vaguely resembles a sine wave. db 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1 db 0, 0, 0, 0, 0, -1, -1, -1, -2, -2, -2, -2, -2, -1, -1, -1 db $80 ; terminator -AnimationSubstitute: ; 796e0 (1e:56e0) +AnimationSubstitute: ; Changes the pokemon's sprite to the mini sprite ld hl, wTempPic xor a @@ -2084,12 +2084,12 @@ AnimationSubstitute: ; 796e0 (1e:56e0) call CopyTempPicToMonPic jp AnimationShowMonPic -CopySlowbroSpriteData: ; 7973f (1e:573f) +CopySlowbroSpriteData: ld bc, $0010 ld a, BANK(SlowbroSprite) jp FarCopyData2 -HideSubstituteShowMonAnim: ; 79747 (1e:5747) +HideSubstituteShowMonAnim: ld a, [H_WHOSETURN] and a ld hl, wPlayerMonMinimized @@ -2114,12 +2114,12 @@ HideSubstituteShowMonAnim: ; 79747 (1e:5747) call AnimationFlashMonPic jp AnimationShowMonPic -ReshowSubstituteAnim: ; 79771 (1e:5771) +ReshowSubstituteAnim: call AnimationSlideMonOff call AnimationSubstitute jp AnimationShowMonPic -AnimationBoundUpAndDown: ; 7977a (1e:577a) +AnimationBoundUpAndDown: ; Bounces the mon's sprite up and down several times. It is used ; by Splash's animation. ld c, 5 @@ -2131,7 +2131,7 @@ AnimationBoundUpAndDown: ; 7977a (1e:577a) jr nz, .loop jp AnimationShowMonPic -AnimationTransformMon: ; 79787 (1e:5787) +AnimationTransformMon: ; Redraws this mon's sprite as the back/front sprite of the opposing mon. ; Used in Transform. ld a, [wEnemyMonSpecies] @@ -2139,7 +2139,7 @@ AnimationTransformMon: ; 79787 (1e:5787) ld a, [wBattleMonSpecies] ld [wChangeMonPicEnemyTurnSpecies], a -ChangeMonPic: ; 79793 (1e:5793) +ChangeMonPic: ld a, [H_WHOSETURN] and a jr z, .playerTurn @@ -2170,7 +2170,7 @@ ChangeMonPic: ; 79793 (1e:5793) ld b, SET_PAL_BATTLE jp RunPaletteCommand -AnimationHideEnemyMonPic: ; 797d8 (1e:57d8) +AnimationHideEnemyMonPic: ; Hides the enemy mon's sprite xor a ld [H_AUTOBGTRANSFERENABLED], a @@ -2180,7 +2180,7 @@ AnimationHideEnemyMonPic: ; 797d8 (1e:57d8) ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -InitMultipleObjectsOAM: ; 797e8 (1e:57e8) +InitMultipleObjectsOAM: ; Writes c OAM entries with tile d. ; Sets their Y coordinates to sequential multiples of 8, starting from 0. ; Sets their X coordinates to 0. @@ -2201,7 +2201,7 @@ InitMultipleObjectsOAM: ; 797e8 (1e:57e8) jr nz, .loop ret -AnimationHideMonPic: ; 79801 (1e:5801) +AnimationHideMonPic: ; Hides the mon's sprite. ld a, [H_WHOSETURN] and a @@ -2211,7 +2211,7 @@ AnimationHideMonPic: ; 79801 (1e:5801) .playerTurn ld a, 5 * SCREEN_WIDTH + 1 -ClearMonPicFromTileMap: ; 7980c (1e:580c) +ClearMonPicFromTileMap: push hl push de push bc @@ -2229,7 +2229,7 @@ ClearMonPicFromTileMap: ; 7980c (1e:580c) ; puts the tile map destination address of a mon sprite in hl, given the row count in b ; The usual row count is 7, but it may be smaller when sliding a mon sprite in/out, ; in order to show only a portion of the mon sprite. -GetMonSpriteTileMapPointerFromRowCount: ; 79820 (1e:5820) +GetMonSpriteTileMapPointerFromRowCount: push de ld a, [H_WHOSETURN] and a @@ -2262,7 +2262,7 @@ GetMonSpriteTileMapPointerFromRowCount: ; 79820 (1e:5820) ; de = tile ID list pointer ; b = number of rows ; c = number of columns -GetTileIDList: ; 79842 (1e:5842) +GetTileIDList: ld hl, TileIDListPointerTable ld e, a ld d, 0 @@ -2283,7 +2283,7 @@ GetTileIDList: ; 79842 (1e:5842) ld b, a ret -AnimCopyRowLeft: ; 7985b (1e:585b) +AnimCopyRowLeft: ; copy a row of c tiles 1 tile left ld a, [hld] ld [hli], a @@ -2292,7 +2292,7 @@ AnimCopyRowLeft: ; 7985b (1e:585b) jr nz, AnimCopyRowLeft ret -AnimCopyRowRight: ; 79862 (1e:5862) +AnimCopyRowRight: ; copy a row of c tiles 1 tile right ld a, [hli] ld [hld], a @@ -2302,14 +2302,14 @@ AnimCopyRowRight: ; 79862 (1e:5862) ret ; get the sound of the move id in b -GetMoveSoundB: ; 79869 (1e:5869) +GetMoveSoundB: ld a, b call GetMoveSound ld b, a ret ; get the sound of the (move id - 1) in a -GetMoveSound: ; 7986f (1e:586f) +GetMoveSound: ld hl,MoveSoundTable ld e,a ld d,0 @@ -2349,7 +2349,7 @@ GetMoveSound: ; 7986f (1e:586f) ld a,b ret -IsCryMove: ; 798ad (1e:58ad) +IsCryMove: ; set carry if the move animation involves playing a monster cry ld a,[wAnimationID] cp a,GROWL @@ -2362,7 +2362,7 @@ IsCryMove: ; 798ad (1e:58ad) scf ret -MoveSoundTable: ; 798bc (1e:58bc) +MoveSoundTable: db SFX_POUND, $00,$80 ; POUND db SFX_BATTLE_0C, $10,$80 ; KARATE_CHOP db SFX_DOUBLESLAP, $00,$80 ; DOUBLESLAP @@ -2530,7 +2530,7 @@ MoveSoundTable: ; 798bc (1e:58bc) db SFX_BATTLE_0B, $00,$80 ; STRUGGLE db SFX_BATTLE_0B, $00,$80 -CopyPicTiles: ; 79aae (1e:5aae) +CopyPicTiles: ld a, [H_WHOSETURN] and a ld a, $31 ; base tile ID of player mon sprite @@ -2542,7 +2542,7 @@ CopyPicTiles: ; 79aae (1e:5aae) jr CopyTileIDs_NoBGTransfer ; copy the tiles used when a mon is being sent out of or into a pokeball -CopyDownscaledMonTiles: ; 79aba (1e:5aba) +CopyDownscaledMonTiles: call GetPredefRegisters ld a, [wDownscaledMonSize] and a @@ -2553,14 +2553,14 @@ CopyDownscaledMonTiles: ; 79aba (1e:5aba) ld de, DownscaledMonTiles_3x3 ; fall through -CopyTileIDs_NoBGTransfer: ; 79acb (1e:5acb) +CopyTileIDs_NoBGTransfer: xor a ld [H_AUTOBGTRANSFERENABLED], a ; fall through ; b = number of rows ; c = number of columns -CopyTileIDs: ; 79ace (1e:5ace) +CopyTileIDs: push hl .rowLoop push bc @@ -2585,7 +2585,7 @@ CopyTileIDs: ; 79ace (1e:5ace) pop hl ret -TileIDListPointerTable: ; 79aea (1e:5aea) +TileIDListPointerTable: dw Unknown_79b24 db $77 dw Unknown_79b55 @@ -2603,19 +2603,19 @@ TileIDListPointerTable: ; 79aea (1e:5aea) dw Unknown_79c50 db $3C -DownscaledMonTiles_5x5: ; 79b02 (1e:5b02) +DownscaledMonTiles_5x5: db $31,$38,$46,$54,$5B db $32,$39,$47,$55,$5C db $34,$3B,$49,$57,$5E db $36,$3D,$4B,$59,$60 db $37,$3E,$4C,$5A,$61 -DownscaledMonTiles_3x3: ; 79b1b (1e:5b1b) +DownscaledMonTiles_3x3: db $31,$46,$5B db $34,$49,$5E db $37,$4C,$61 -Unknown_79b24: ; 79b24 (1e:5b24) +Unknown_79b24: db $00,$07,$0E,$15,$1C,$23,$2A db $01,$08,$0F,$16,$1D,$24,$2B db $02,$09,$10,$17,$1E,$25,$2C @@ -2624,19 +2624,19 @@ Unknown_79b24: ; 79b24 (1e:5b24) db $05,$0C,$13,$1A,$21,$28,$2F db $06,$0D,$14,$1B,$22,$29,$30 -Unknown_79b55: ; 79b55 (1e:5b55) +Unknown_79b55: db $00,$07,$0E,$15,$1C,$23,$2A db $01,$08,$0F,$16,$1D,$24,$2B db $03,$0A,$11,$18,$1F,$26,$2D db $04,$0B,$12,$19,$20,$27,$2E db $05,$0C,$13,$1A,$21,$28,$2F -Unknown_79b78: ; 79b78 (1e:5b78) +Unknown_79b78: db $00,$07,$0E,$15,$1C,$23,$2A db $02,$09,$10,$17,$1E,$25,$2C db $04,$0B,$12,$19,$20,$27,$2E -Unknown_79b8d: ; 79b8d (1e:5b8d) +Unknown_79b8d: db $00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$19,$00 db $02,$06,$0B,$10,$14,$1A,$00 @@ -2645,7 +2645,7 @@ Unknown_79b8d: ; 79b8d (1e:5b8d) db $04,$09,$0E,$13,$17,$1D,$1F db $05,$0A,$0F,$01,$18,$1E,$20 -Unknown_79bbe: ; 79bbe (1e:5bbe) +Unknown_79bbe: db $00,$00,$00,$30,$00,$37,$00 db $00,$00,$2B,$31,$34,$38,$3D db $21,$26,$2C,$01,$35,$39,$3E @@ -2654,7 +2654,7 @@ Unknown_79bbe: ; 79bbe (1e:5bbe) db $24,$29,$2F,$01,$01,$3B,$00 db $25,$2A,$01,$01,$01,$3C,$00 -Unknown_79bef: ; 79bef (1e:5bef) +Unknown_79bef: db $00,$00,$00,$00,$00,$00,$00 db $00,$00,$47,$4D,$00,$00,$00 db $00,$00,$48,$4E,$52,$56,$5B @@ -2663,7 +2663,7 @@ Unknown_79bef: ; 79bef (1e:5bef) db $41,$45,$4B,$51,$4C,$59,$5D db $42,$46,$4C,$4C,$55,$5A,$5E -Unknown_79c20: ; 79c20 (1e:5c20) +Unknown_79c20: db $31,$32,$32,$32,$32,$33 db $34,$35,$36,$36,$37,$38 db $34,$39,$3A,$3A,$3B,$38 @@ -2673,12 +2673,12 @@ Unknown_79c20: ; 79c20 (1e:5c20) db $41,$43,$4B,$4C,$4D,$4E db $4F,$50,$50,$50,$51,$52 -Unknown_79c50: ; 79c50 (1e:5c50) +Unknown_79c50: db $43,$55,$56,$53,$53,$53,$53,$53,$53,$53,$53,$53 db $43,$57,$58,$54,$54,$54,$54,$54,$54,$54,$54,$54 db $43,$59,$5A,$43,$43,$43,$43,$43,$43,$43,$43,$43 -AnimationLeavesFalling: ; 79c74 (1e:5c74) +AnimationLeavesFalling: ; Makes leaves float down from the top of the screen. This is used ; in Razor Leaf's animation. ld a, [rOBP0] @@ -2693,7 +2693,7 @@ AnimationLeavesFalling: ; 79c74 (1e:5c74) ld [rOBP0], a ret -AnimationPetalsFalling: ; 79c8a (1e:5c8a) +AnimationPetalsFalling: ; Makes lots of petals fall down from the top of the screen. It's used in ; the animation for Petal Dance. ld d, $71 ; petal tile @@ -2702,7 +2702,7 @@ AnimationPetalsFalling: ; 79c8a (1e:5c8a) call AnimationFallingObjects jp ClearSprites -AnimationFallingObjects: ; 79c97 (1e:5c97) +AnimationFallingObjects: ld c, a ld a, 1 call InitMultipleObjectsOAM @@ -2741,7 +2741,7 @@ AnimationFallingObjects: ; 79c97 (1e:5c97) jr nz, .loop ; keep moving the falling objects down until it does ret -FallingObjects_UpdateOAMEntry: ; 79cdb (1e:5cdb) +FallingObjects_UpdateOAMEntry: ; Increases Y by 2 pixels and adjusts X and X flip based on the falling object's ; movement byte. ld hl, wOAMBuffer @@ -2785,10 +2785,10 @@ FallingObjects_UpdateOAMEntry: ; 79cdb (1e:5cdb) ld [hl], a ; attribute ret -FallingObjects_DeltaXs: ; 79d0d (1e:5d0d) +FallingObjects_DeltaXs: db 0, 1, 3, 5, 7, 9, 11, 13, 15 -FallingObjects_UpdateMovementByte: ; 79d16 (1e:5d16) +FallingObjects_UpdateMovementByte: ld a, [wFallingObjectMovementByte] inc a ld b, a @@ -2804,7 +2804,7 @@ FallingObjects_UpdateMovementByte: ; 79d16 (1e:5d16) ld [wFallingObjectMovementByte], a ret -FallingObjects_InitXCoords: ; 79d2a (1e:5d2a) +FallingObjects_InitXCoords: ld hl, wOAMBuffer + $01 ld de, FallingObjects_InitialXCoords ld a, [wNumFallingObjects] @@ -2820,10 +2820,10 @@ FallingObjects_InitXCoords: ; 79d2a (1e:5d2a) jr nz, .loop ret -FallingObjects_InitialXCoords: ; 79d3e (1e:5d3e) +FallingObjects_InitialXCoords: db $38,$40,$50,$60,$70,$88,$90,$56,$67,$4A,$77,$84,$98,$32,$22,$5C,$6C,$7D,$8E,$99 -FallingObjects_InitMovementData: ; 79d52 (1e:5d52) +FallingObjects_InitMovementData: ld hl, wFallingObjectsMovementData ld de, FallingObjects_InitialMovementData ld a, [wNumFallingObjects] @@ -2836,10 +2836,10 @@ FallingObjects_InitMovementData: ; 79d52 (1e:5d52) jr nz, .loop ret -FallingObjects_InitialMovementData: ; 79d63 (1e:5d63) +FallingObjects_InitialMovementData: db $00,$84,$06,$81,$02,$88,$01,$83,$05,$89,$09,$80,$07,$87,$03,$82,$04,$85,$08,$86 -AnimationShakeEnemyHUD: ; 79d77 (1e:5d77) +AnimationShakeEnemyHUD: ; Shakes the enemy HUD. ; Make a copy of the back pic's tile patterns in sprite tile pattern VRAM. @@ -2912,7 +2912,7 @@ AnimationShakeEnemyHUD: ; 79d77 (1e:5d77) ; b = tile ID list index ; c = base tile ID -CopyTileIDsFromList: ; 79dda (1e:5dda) +CopyTileIDsFromList: call GetPredefRegisters ld a, c ld [hBaseTileID], a @@ -2922,7 +2922,7 @@ CopyTileIDsFromList: ; 79dda (1e:5dda) pop hl jp CopyTileIDs -ShakeEnemyHUD_ShakeBG: ; 79de9 (1e:5de9) +ShakeEnemyHUD_ShakeBG: ld a, [hSCX] ld [wTempSCX], a .loop @@ -2942,14 +2942,14 @@ ShakeEnemyHUD_ShakeBG: ; 79de9 (1e:5de9) ld [hSCX], a ret -BattleAnimCopyTileMapToVRAM: ; 79e0d (1e:5e0d) +BattleAnimCopyTileMapToVRAM: ld a, h ld [H_AUTOBGTRANSFERDEST + 1], a ld a, l ld [H_AUTOBGTRANSFERDEST], a jp Delay3 -TossBallAnimation: ; 79e16 (1e:5e16) +TossBallAnimation: ld a,[wIsInBattle] cp a,2 jr z,.BlockBall ; if in trainer battle, play different animation @@ -2992,7 +2992,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) jr nz,.PlayNextAnimation ret -.PokeBallAnimations: ; 79e50 (1e:5e50) +.PokeBallAnimations: ; sequence of animations that make up the Poké Ball toss db POOF_ANIM,HIDEPIC_ANIM,SHAKE_ANIM,POOF_ANIM,SHOWPIC_ANIM @@ -3006,7 +3006,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) ld [wAnimationID],a jp PlayAnimation -PlayApplyingAttackSound: ; 79e6a (1e:5e6a) +PlayApplyingAttackSound: ; play a different sound depending if move is not very effective, neutral, or super-effective ; don't play any sound at all if move is ineffective call WaitForSoundToFinish diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/bank_e_misc.asm index dc766f23..33af6f6f 100755 --- a/engine/battle/bank_e_misc.asm +++ b/engine/battle/bank_e_misc.asm @@ -1,5 +1,5 @@ ; formats a string at wMovesString that lists the moves at wMoves -FormatMovesString: ; 39b87 (e:5b87) +FormatMovesString: ld hl, wMoves ld de, wMovesString ld b, $0 @@ -52,7 +52,7 @@ FormatMovesString: ; 39b87 (e:5b87) ret ; XXX this is called in a few places, but it doesn't appear to do anything useful -InitList: ; 39bd5 (e:5bd5) +InitList: ld a, [wInitListType] cp INIT_ENEMYOT_LIST jr nz, .notEnemy @@ -103,7 +103,7 @@ InitList: ; 39bd5 (e:5bd5) ret ; get species of mon e in list [wMonDataLocation] for LoadMonData -GetMonSpecies: ; 39c37 (e:5c37) +GetMonSpecies: ld hl, wPartySpecies ld a, [wMonDataLocation] and a diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 545273ee..9e02c56f 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -1,4 +1,4 @@ -BattleTransition: ; 7096d (1c:496d) +BattleTransition: ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 @@ -70,7 +70,7 @@ BattleTransition: ; 7096d (1c:496d) ; bit 0: set if trainer battle ; bit 1: set if enemy is at least 3 levels higher than player ; bit 2: set if dungeon map -BattleTransitions: ; 709d2 (1c:49d2) +BattleTransitions: dw BattleTransition_DoubleCircle ; %000 dw BattleTransition_Spiral ; %001 dw BattleTransition_Circle ; %010 @@ -80,7 +80,7 @@ BattleTransitions: ; 709d2 (1c:49d2) dw BattleTransition_VerticalStripes ; %110 dw BattleTransition_Split ; %111 -GetBattleTransitionID_WildOrTrainer: ; 709e2 (1c:49e2) +GetBattleTransitionID_WildOrTrainer: ld a, [wCurOpponent] cp 200 jr nc, .trainer @@ -90,7 +90,7 @@ GetBattleTransitionID_WildOrTrainer: ; 709e2 (1c:49e2) set 0, c ret -GetBattleTransitionID_CompareLevels: ; 709ef (1c:49ef) +GetBattleTransitionID_CompareLevels: ld hl, wPartyMon1HP .faintedLoop ld a, [hli] @@ -121,7 +121,7 @@ GetBattleTransitionID_CompareLevels: ; 709ef (1c:49ef) ; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps, ; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE ; and SILPH_CO_[9-11]F as dungeon maps -GetBattleTransitionID_IsDungeonMap: ; 70a19 (1c:4a19) +GetBattleTransitionID_IsDungeonMap: ld a, [wCurMap] ld e, a ld hl, DungeonMaps1 @@ -153,7 +153,7 @@ GetBattleTransitionID_IsDungeonMap: ; 70a19 (1c:4a19) ; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is equal to one of these maps -DungeonMaps1: ; 70a3f (1c:4a3f) +DungeonMaps1: db VIRIDIAN_FOREST db ROCK_TUNNEL_1 db SEAFOAM_ISLANDS_1 @@ -162,7 +162,7 @@ DungeonMaps1: ; 70a3f (1c:4a3f) ; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is in between or equal to each pair of maps -DungeonMaps2: ; 70a44 (1c:4a44) +DungeonMaps2: ; all MT_MOON maps db MT_MOON_1 db MT_MOON_3 @@ -181,17 +181,17 @@ DungeonMaps2: ; 70a44 (1c:4a44) db UNKNOWN_DUNGEON_1 db $FF -LoadBattleTransitionTile: ; 70a4d (1c:4a4d) +LoadBattleTransitionTile: ld hl, vChars1 + $7f0 ld de, BattleTransitionTile lb bc, BANK(BattleTransitionTile), (BattleTransitionTileEnd - BattleTransitionTile) / $10 jp CopyVideoData -BattleTransitionTile: ; 70a59 (1c:4a59) +BattleTransitionTile: INCBIN "gfx/battle_transition.2bpp" BattleTransitionTileEnd: -BattleTransition_BlackScreen: ; 70a69 (1c:4a69) +BattleTransition_BlackScreen: ld a, $ff ld [rBGP], a ld [rOBP0], a @@ -202,7 +202,7 @@ BattleTransition_BlackScreen: ; 70a69 (1c:4a69) ; called regardless of mon levels, but does an ; outward spiral if enemy is at least 3 levels ; higher than player and does an inward spiral otherwise -BattleTransition_Spiral: ; 70a72 (1c:4a72) +BattleTransition_Spiral: ld a, [wBattleTransitionSpiralDirection] and a jr z, .outwardSpiral @@ -235,7 +235,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72) ld [wOutwardSpiralTileMapPointer], a ret -BattleTransition_InwardSpiral: ; 70aaa (1c:4aaa) +BattleTransition_InwardSpiral: ld a, 7 ld [wInwardSpiralUpdateScreenCounter], a coord hl, 0, 0 @@ -265,7 +265,7 @@ BattleTransition_InwardSpiral: ; 70aaa (1c:4aaa) jr nz, .loop ret -BattleTransition_InwardSpiral_: ; 70ae0 (1c:4ae0) +BattleTransition_InwardSpiral_: push bc .loop ld [hl], $ff @@ -284,7 +284,7 @@ BattleTransition_InwardSpiral_: ; 70ae0 (1c:4ae0) pop bc ret -BattleTransition_OutwardSpiral_: ; 70af9 (1c:4af9) +BattleTransition_OutwardSpiral_: ld bc, -SCREEN_WIDTH ld de, SCREEN_WIDTH ld a, [wOutwardSpiralTileMapPointer + 1] @@ -352,7 +352,7 @@ BattleTransition_OutwardSpiral_: ; 70af9 (1c:4af9) jr .done FlashScreen: -BattleTransition_FlashScreen_: ; 70b5d (1c:4b5d) +BattleTransition_FlashScreen_: ld hl, BattleTransition_FlashScreenPalettes .loop ld a, [hli] @@ -367,12 +367,12 @@ BattleTransition_FlashScreen_: ; 70b5d (1c:4b5d) jr nz, BattleTransition_FlashScreen_ ret -BattleTransition_FlashScreenPalettes: ; 70b72 (1c:4b72) +BattleTransition_FlashScreenPalettes: db $F9,$FE,$FF,$FE,$F9,$E4,$90,$40,$00,$40,$90,$E4 db $01 ; terminator ; used for low level trainer dungeon battles -BattleTransition_Shrink: ; 70b7f (1c:4b7f) +BattleTransition_Shrink: ld c, SCREEN_HEIGHT / 2 .loop push bc @@ -406,7 +406,7 @@ BattleTransition_Shrink: ; 70b7f (1c:4b7f) jp DelayFrames ; used for high level trainer dungeon battles -BattleTransition_Split: ; 70bca (1c:4bca) +BattleTransition_Split: ld c, SCREEN_HEIGHT / 2 xor a ld [H_AUTOBGTRANSFERENABLED], a @@ -437,7 +437,7 @@ BattleTransition_Split: ; 70bca (1c:4bca) ld c, 10 jp DelayFrames -BattleTransition_CopyTiles1: ; 70c12 (1c:4c12) +BattleTransition_CopyTiles1: ld a, c ld [wBattleTransitionCopyTilesOffset], a ld a, b @@ -469,7 +469,7 @@ BattleTransition_CopyTiles1: ; 70c12 (1c:4c12) jr nz, .loop2 ret -BattleTransition_CopyTiles2: ; 70c3f (1c:4c3f) +BattleTransition_CopyTiles2: ld a, c ld [wBattleTransitionCopyTilesOffset], a ld a, b @@ -519,7 +519,7 @@ BattleTransition_CopyTiles2: ; 70c3f (1c:4c3f) ret ; used for high level wild dungeon battles -BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e) +BattleTransition_VerticalStripes: ld c, SCREEN_HEIGHT coord hl, 0, 0 coord de, 1, 17 @@ -547,7 +547,7 @@ BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e) jr nz, .loop jp BattleTransition_BlackScreen -BattleTransition_VerticalStripes_: ; 70caa (1c:4caa) +BattleTransition_VerticalStripes_: ld c, SCREEN_WIDTH / 2 .loop ld [hl], $ff @@ -558,7 +558,7 @@ BattleTransition_VerticalStripes_: ; 70caa (1c:4caa) ret ; used for low level wild dungeon battles -BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4) +BattleTransition_HorizontalStripes: ld c, SCREEN_WIDTH coord hl, 0, 0 coord de, 19, 1 @@ -582,7 +582,7 @@ BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4) jr nz, .loop jp BattleTransition_BlackScreen -BattleTransition_HorizontalStripes_: ; 70cd8 (1c:4cd8) +BattleTransition_HorizontalStripes_: ld c, SCREEN_HEIGHT / 2 ld de, SCREEN_WIDTH * 2 .loop @@ -595,7 +595,7 @@ BattleTransition_HorizontalStripes_: ; 70cd8 (1c:4cd8) ; used for high level wild non-dungeon battles ; makes one full circle around the screen ; by animating each half circle one at a time -BattleTransition_Circle: ; 70ce4 (1c:4ce4) +BattleTransition_Circle: call BattleTransition_FlashScreen lb bc, 0, SCREEN_WIDTH / 2 ld hl, BattleTransition_HalfCircle1 @@ -606,14 +606,14 @@ BattleTransition_Circle: ; 70ce4 (1c:4ce4) call BattleTransition_Circle_Sub1 jp BattleTransition_BlackScreen -BattleTransition_FlashScreen: ; 70cfd (1c:4cfd) +BattleTransition_FlashScreen: ld b, $3 call BattleTransition_FlashScreen_ xor a ld [H_AUTOBGTRANSFERENABLED], a ret -BattleTransition_Circle_Sub1: ; 70d06 (1c:4d06) +BattleTransition_Circle_Sub1: push bc push hl ld a, b @@ -627,7 +627,7 @@ BattleTransition_Circle_Sub1: ; 70d06 (1c:4d06) jr nz, BattleTransition_Circle_Sub1 ret -BattleTransition_TransferDelay3: ; 70d19 (1c:4d19) +BattleTransition_TransferDelay3: ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 @@ -638,7 +638,7 @@ BattleTransition_TransferDelay3: ; 70d19 (1c:4d19) ; used for low level wild non-dungeon battles ; makes two half circles around the screen ; by animating both half circles at the same time -BattleTransition_DoubleCircle: ; 70d24 (1c:4d24) +BattleTransition_DoubleCircle: call BattleTransition_FlashScreen ld c, SCREEN_WIDTH / 2 ld hl, BattleTransition_HalfCircle1 @@ -666,7 +666,7 @@ BattleTransition_DoubleCircle: ; 70d24 (1c:4d24) jr nz, .loop jp BattleTransition_BlackScreen -BattleTransition_Circle_Sub2: ; 70d50 (1c:4d50) +BattleTransition_Circle_Sub2: ld [wBattleTransitionCircleScreenQuadrantY], a ld a, [hli] ld [wBattleTransitionCircleScreenQuadrantX], a @@ -679,7 +679,7 @@ BattleTransition_Circle_Sub2: ; 70d50 (1c:4d50) ld l, a jp BattleTransition_Circle_Sub3 -BattleTransition_HalfCircle1: ; 70d61 (1c:4d61) +BattleTransition_HalfCircle1: db $01 dw BattleTransition_CircleData1 dwCoord 18, 6 @@ -720,7 +720,7 @@ BattleTransition_HalfCircle1: ; 70d61 (1c:4d61) dw BattleTransition_CircleData1 dwCoord 1, 6 -BattleTransition_HalfCircle2: ; 70d93 (1c:4d93) +BattleTransition_HalfCircle2: db $00 dw BattleTransition_CircleData1 dwCoord 1, 11 @@ -761,7 +761,7 @@ BattleTransition_HalfCircle2: ; 70d93 (1c:4d93) dw BattleTransition_CircleData1 dwCoord 18, 11 -BattleTransition_Circle_Sub3: ; 70dc5 (1c:4dc5) +BattleTransition_Circle_Sub3: push hl ld a, [de] ld c, a @@ -806,17 +806,17 @@ BattleTransition_Circle_Sub3: ; 70dc5 (1c:4dc5) jr nz, .loop2 jr BattleTransition_Circle_Sub3 -BattleTransition_CircleData1: ; 70dfe (1c:4dfe) +BattleTransition_CircleData1: db $02,$03,$05,$04,$09,$FF -BattleTransition_CircleData2: ; 70e04 (1c:4e04) +BattleTransition_CircleData2: db $01,$01,$02,$02,$04,$02,$04,$02,$03,$FF -BattleTransition_CircleData3: ; 70e0e (1c:4e0e) +BattleTransition_CircleData3: db $02,$01,$03,$01,$04,$01,$04,$01,$04,$01,$03,$01,$02,$01,$01,$01,$01,$FF -BattleTransition_CircleData4: ; 70e20 (1c:4e20) +BattleTransition_CircleData4: db $04,$01,$04,$00,$03,$01,$03,$00,$02,$01,$02,$00,$01,$FF -BattleTransition_CircleData5: ; 70e2e (1c:4e2e) +BattleTransition_CircleData5: db $04,$00,$03,$00,$03,$00,$02,$00,$02,$00,$01,$00,$01,$00,$01,$FF diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 476284f0..3d46c947 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -1,4 +1,4 @@ -PrintBeginningBattleText: ; 58d99 (16:4d99) +PrintBeginningBattleText: ld a, [wIsInBattle] dec a jr nz, .trainerBattle @@ -70,31 +70,31 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) .done ret -WildMonAppearedText: ; 58e3b (16:4e3b) +WildMonAppearedText: TX_FAR _WildMonAppearedText db "@" -HookedMonAttackedText: ; 58e40 (16:4e40) +HookedMonAttackedText: TX_FAR _HookedMonAttackedText db "@" -EnemyAppearedText: ; 58e45 (16:4e45) +EnemyAppearedText: TX_FAR _EnemyAppearedText db "@" -TrainerWantsToFightText: ; 58e4a (16:4e4a) +TrainerWantsToFightText: TX_FAR _TrainerWantsToFightText db "@" -UnveiledGhostText: ; 58e4f (16:4e4f) +UnveiledGhostText: TX_FAR _UnveiledGhostText db "@" -GhostCantBeIDdText: ; 58e54 (16:4e54) +GhostCantBeIDdText: TX_FAR _GhostCantBeIDdText db "@" -PrintSendOutMonMessage: ; 58e59 (16:4e59) +PrintSendOutMonMessage: ld hl, wEnemyMonHP ld a, [hli] or [hl] @@ -137,22 +137,22 @@ PrintSendOutMonMessage: ; 58e59 (16:4e59) .printText jp PrintText -GoText: ; 58eae (16:4eae) +GoText: TX_FAR _GoText TX_ASM jr PrintPlayerMon1Text -DoItText: ; 58eb5 (16:4eb5) +DoItText: TX_FAR _DoItText TX_ASM jr PrintPlayerMon1Text -GetmText: ; 58ebc (16:4ebc) +GetmText: TX_FAR _GetmText TX_ASM jr PrintPlayerMon1Text -EnemysWeakText: ; 58ec3 (16:4ec3) +EnemysWeakText: TX_FAR _EnemysWeakText TX_ASM @@ -160,15 +160,15 @@ PrintPlayerMon1Text: ld hl, PlayerMon1Text ret -PlayerMon1Text: ; 58ecc (16:4ecc) +PlayerMon1Text: TX_FAR _PlayerMon1Text db "@" -RetreatMon: ; 58ed1 (16:4ed1) +RetreatMon: ld hl, PlayerMon2Text jp PrintText -PlayerMon2Text: ; 58ed7 (16:4ed7) +PlayerMon2Text: TX_FAR _PlayerMon2Text TX_ASM push de @@ -219,25 +219,25 @@ PlayerMon2Text: ; 58ed7 (16:4ed7) ld hl, GoodText ; HP went down 70% or more ret -EnoughText: ; 58f25 (16:4f25) +EnoughText: TX_FAR _EnoughText TX_ASM jr PrintComeBackText -OKExclamationText: ; 58f2c (16:4f2c) +OKExclamationText: TX_FAR _OKExclamationText TX_ASM jr PrintComeBackText -GoodText: ; 58f33 (16:4f33) +GoodText: TX_FAR _GoodText TX_ASM jr PrintComeBackText -PrintComeBackText: ; 58f3a (16:4f3a) +PrintComeBackText: ld hl, ComeBackText ret -ComeBackText: ; 58f3e (16:4f3e) +ComeBackText: TX_FAR _ComeBackText db "@" diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fce78717..f8053a9e 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1,7 +1,7 @@ BattleCore: ; These are move effects (second value from the Moves table in bank $E). -ResidualEffects1: ; 3c000 (f:4000) +ResidualEffects1: ; most non-side effects db CONVERSION_EFFECT db HAZE_EFFECT @@ -20,13 +20,13 @@ ResidualEffects1: ; 3c000 (f:4000) db LEECH_SEED_EFFECT db SPLASH_EFFECT db -1 -SetDamageEffects: ; 3c011 (f:4011) +SetDamageEffects: ; moves that do damage but not through normal calculations ; e.g., Super Fang, Psywave db SUPER_FANG_EFFECT db SPECIAL_DAMAGE_EFFECT db -1 -ResidualEffects2: ; 3c014 (f:4014) +ResidualEffects2: ; non-side effects not included in ResidualEffects1 ; stat-affecting moves, sleep-inflicting moves, and Bide ; e.g., Meditate, Bide, Hypnosis @@ -58,7 +58,7 @@ ResidualEffects2: ; 3c014 (f:4014) db ACCURACY_DOWN2_EFFECT db EVASION_DOWN2_EFFECT db -1 -AlwaysHappenSideEffects: ; 3c030 (f:4030) +AlwaysHappenSideEffects: ; Attacks that aren't finished after they faint the opponent. db DRAIN_HP_EFFECT db EXPLODE_EFFECT @@ -71,7 +71,7 @@ AlwaysHappenSideEffects: ; 3c030 (f:4030) db TWINEEDLE_EFFECT db RAGE_EFFECT db -1 -SpecialEffects: ; 3c03b (f:403b) +SpecialEffects: ; Effects from arrays 2, 4, and 5B, minus Twineedle and Rage. ; Includes all effects that do not need to be called at the end of ; ExecutePlayerMove (or ExecuteEnemyMove), because they have already been handled @@ -90,13 +90,13 @@ SpecialEffects: ; 3c03b (f:403b) db JUMP_KICK_EFFECT db RECOIL_EFFECT ; fallthrough to Next EffectsArray -SpecialEffectsCont: ; 3c049 (f:4049) +SpecialEffectsCont: ; damaging moves whose effect is executed prior to damage calculation db THRASH_PETAL_DANCE_EFFECT db TRAPPING_EFFECT db -1 -SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) +SlidePlayerAndEnemySilhouettesOnScreen: call LoadPlayerBackPic ld a, MESSAGE_BOX ; the usual text box at the bottom of the screen ld [wTextBoxID], a @@ -193,7 +193,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ; the lower of the player's pic (his body) is part of the background, but his head is a sprite ; the reason for this is that it shares Y coordinates with the lower part of the enemy pic, so background scrolling wouldn't work for both pics ; instead, the enemy pic is part of the background and uses the scroll register, while the player's head is a sprite and is slid by changing its X coordinates in a loop -SlidePlayerHeadLeft: ; 3c0ff (f:40ff) +SlidePlayerHeadLeft: push bc ld hl, wOAMBuffer + $01 ld c, $15 ; number of OAM entries @@ -207,7 +207,7 @@ SlidePlayerHeadLeft: ; 3c0ff (f:40ff) pop bc ret -SetScrollXForSlidingPlayerBodyLeft: ; 3c110 (f:4110) +SetScrollXForSlidingPlayerBodyLeft: ld a, [rLY] cp l jr nz, SetScrollXForSlidingPlayerBodyLeft @@ -219,7 +219,7 @@ SetScrollXForSlidingPlayerBodyLeft: ; 3c110 (f:4110) jr z, .loop ret -StartBattle: ; 3c11e (f:411e) +StartBattle: xor a ld [wPartyGainExpFlags], a ld [wPartyFoughtCurrentEnemyFlags], a @@ -341,7 +341,7 @@ StartBattle: ; 3c11e (f:411e) jr MainInBattleLoop ; wild mon or link battle enemy ran from battle -EnemyRan: ; 3c202 (f:4202) +EnemyRan: call LoadScreenTilesFromBuffer1 ld a, [wLinkState] cp LINK_STATE_BATTLING @@ -359,15 +359,15 @@ EnemyRan: ; 3c202 (f:4202) ld [H_WHOSETURN], a jpab AnimationSlideEnemyMonOff -WildRanText: ; 3c229 (f:4229) +WildRanText: TX_FAR _WildRanText db "@" -EnemyRanText: ; 3c22e (f:422e) +EnemyRanText: TX_FAR _EnemyRanText db "@" -MainInBattleLoop: ; 3c233 (f:4233) +MainInBattleLoop: call ReadPlayerMonCurHPAndStatus ld hl, wBattleMonHP ld a, [hli] @@ -557,7 +557,7 @@ MainInBattleLoop: ; 3c233 (f:4233) call CheckNumAttacksLeft jp MainInBattleLoop -HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd) +HandlePoisonBurnLeechSeed: ld hl, wBattleMonHP ld de, wBattleMonStatus ld a, [H_WHOSETURN] @@ -621,15 +621,15 @@ HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd) xor a ret -HurtByPoisonText: ; 3c42e (f:442e) +HurtByPoisonText: TX_FAR _HurtByPoisonText db "@" -HurtByBurnText: ; 3c433 (f:4433) +HurtByBurnText: TX_FAR _HurtByBurnText db "@" -HurtByLeechSeedText: ; 3c438 (f:4438) +HurtByLeechSeedText: TX_FAR _HurtByLeechSeedText db "@" @@ -637,7 +637,7 @@ HurtByLeechSeedText: ; 3c438 (f:4438) ; note that the toxic ticks are considered even if the damage is not poison (hence the Leech Seed glitch) ; hl: HP pointer ; bc (out): total damage -HandlePoisonBurnLeechSeed_DecreaseOwnHP: ; 3c43d (f:443d) +HandlePoisonBurnLeechSeed_DecreaseOwnHP: push hl push hl ld bc, $e ; skip to max HP @@ -705,7 +705,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ; 3c43d (f:443d) ; adds bc to enemy HP ; bc isn't updated if HP substracted was capped to prevent overkill -HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3) +HandlePoisonBurnLeechSeed_IncreaseEnemyHP: push hl ld hl, wEnemyMonMaxHP ld a, [H_WHOSETURN] @@ -755,7 +755,7 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3) pop hl ret -UpdateCurMonHPBar: ; 3c4f6 (f:44f6) +UpdateCurMonHPBar: coord hl, 10, 9 ; tile pointer to player HP bar ld a, [H_WHOSETURN] and a @@ -770,7 +770,7 @@ UpdateCurMonHPBar: ; 3c4f6 (f:44f6) pop bc ret -CheckNumAttacksLeft: ; 3c50f (f:450f) +CheckNumAttacksLeft: ld a, [wPlayerNumAttacksLeft] and a jr nz, .checkEnemy @@ -786,7 +786,7 @@ CheckNumAttacksLeft: ; 3c50f (f:450f) res UsingTrappingMove, [hl] ; enemy not using multi-turn attack like wrap any more ret -HandleEnemyMonFainted: ; 3c525 (f:4525) +HandleEnemyMonFainted: xor a ld [wInHandlePlayerMonFainted], a call FaintEnemyPokemon @@ -949,7 +949,7 @@ EnemyMonFaintedText: ; 0x3c63e TX_FAR _EnemyMonFaintedText db "@" -EndLowHealthAlarm: ; 3c643 (f:4643) +EndLowHealthAlarm: ; This function is called when the player has the won the battle. It turns off ; the low health alarm and prevents it from reactivating until the next battle. xor a @@ -959,7 +959,7 @@ EndLowHealthAlarm: ; 3c643 (f:4643) ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret -AnyEnemyPokemonAliveCheck: ; 3c64f (f:464f) +AnyEnemyPokemonAliveCheck: ld a, [wEnemyPartyCount] ld b, a xor a @@ -977,7 +977,7 @@ AnyEnemyPokemonAliveCheck: ; 3c64f (f:464f) ret ; stores whether enemy ran in Z flag -ReplaceFaintedEnemyMon: ; 3c664 (f:4664) +ReplaceFaintedEnemyMon: ld hl, wEnemyHPBarColor ld e, $30 call GetBattleHealthBarColor @@ -1000,7 +1000,7 @@ ReplaceFaintedEnemyMon: ; 3c664 (f:4664) inc a ; reset Z flag ret -TrainerBattleVictory: ; 3c696 (f:4696) +TrainerBattleVictory: call EndLowHealthAlarm ld b, MUSIC_DEFEATED_GYM_LEADER ld a, [wGymLeaderNo] @@ -1036,15 +1036,15 @@ TrainerBattleVictory: ; 3c696 (f:4696) ld c, $3 predef_jump AddBCDPredef -MoneyForWinningText: ; 3c6e4 (f:46e4) +MoneyForWinningText: TX_FAR _MoneyForWinningText db "@" -TrainerDefeatedText: ; 3c6e9 (f:46e9) +TrainerDefeatedText: TX_FAR _TrainerDefeatedText db "@" -PlayBattleVictoryMusic: ; 3c6ee (f:46ee) +PlayBattleVictoryMusic: push af ld a, $ff ld [wNewSoundID], a @@ -1054,7 +1054,7 @@ PlayBattleVictoryMusic: ; 3c6ee (f:46ee) call PlayMusic jp Delay3 -HandlePlayerMonFainted: ; 3c700 (f:4700) +HandlePlayerMonFainted: ld a, 1 ld [wInHandlePlayerMonFainted], a call RemoveFaintedPlayerMon @@ -1088,7 +1088,7 @@ HandlePlayerMonFainted: ; 3c700 (f:4700) jp MainInBattleLoop ; resets flags, slides mon's pic down, plays cry, and prints fainted message -RemoveFaintedPlayerMon: ; 3c741 (f:4741) +RemoveFaintedPlayerMon: ld a, [wPlayerMonNumber] ld c, a ld hl, wPartyGainExpFlags @@ -1131,13 +1131,13 @@ RemoveFaintedPlayerMon: ; 3c741 (f:4741) ld hl, PlayerMonFaintedText jp PrintText -PlayerMonFaintedText: ; 3c796 (f:4796) +PlayerMonFaintedText: TX_FAR _PlayerMonFaintedText db "@" ; asks if you want to use next mon ; stores whether you ran in C flag -DoUseNextMonDialogue: ; 3c79b (f:479b) +DoUseNextMonDialogue: call PrintEmptyString call SaveScreenTilesToBuffer1 ld a, [wIsInBattle] @@ -1165,13 +1165,13 @@ DoUseNextMonDialogue: ; 3c79b (f:479b) ld de, wEnemyMonSpeed jp TryRunningFromBattle -UseNextMonText: ; 3c7d3 (f:47d3) +UseNextMonText: TX_FAR _UseNextMonText db "@" ; choose next player mon to send out ; stores whether enemy mon has no HP left in Z flag -ChooseNextMon: ; 3c7d8 (f:47d8) +ChooseNextMon: ld a, BATTLE_PARTY_MENU ld [wPartyMenuTypeOrMessageID], a call DisplayPartyMenu @@ -1217,7 +1217,7 @@ ChooseNextMon: ; 3c7d8 (f:47d8) ; called when player is out of usable mons. ; prints approriate lose message, sets carry flag if player blacked out (special case for initial rival fight) -HandlePlayerBlackOut: ; 3c837 (f:4837) +HandlePlayerBlackOut: ld a, [wLinkState] cp LINK_STATE_BATTLING jr z, .notSony1Battle @@ -1252,21 +1252,21 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) scf ret -Sony1WinText: ; 3c884 (f:4884) +Sony1WinText: TX_FAR _Sony1WinText db "@" -PlayerBlackedOutText2: ; 3c889 (f:4889) +PlayerBlackedOutText2: TX_FAR _PlayerBlackedOutText2 db "@" -LinkBattleLostText: ; 3c88e (f:488e) +LinkBattleLostText: TX_FAR _LinkBattleLostText db "@" ; slides pic of fainted mon downwards until it disappears ; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing -SlideDownFaintedMonPic: ; 3c893 (f:4893) +SlideDownFaintedMonPic: ld a, [wd730] push af set 6, a @@ -1312,14 +1312,14 @@ SlideDownFaintedMonPic: ; 3c893 (f:4893) ld [wd730], a ret -SevenSpacesText: ; 3c8d7 (f:48d7) +SevenSpacesText: db " @" ; slides the player or enemy trainer off screen ; a is the number of tiles to slide it horizontally (always 9 for the player trainer or 8 for the enemy trainer) ; if a is 8, the slide is to the right, else it is to the left ; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing -SlideTrainerPicOffScreen: ; 3c8df (f:48df) +SlideTrainerPicOffScreen: ld [hSlideAmount], a ld c, a .slideStepLoop ; each iteration, the trainer pic is slid one tile left/right @@ -1360,7 +1360,7 @@ SlideTrainerPicOffScreen: ; 3c8df (f:48df) ret ; send out a trainer's mon -EnemySendOut: ; 3c90e (f:490e) +EnemySendOut: ld hl,wPartyGainExpFlags xor a ld [hl],a @@ -1376,7 +1376,7 @@ EnemySendOut: ; 3c90e (f:490e) predef FlagActionPredef ; don't change wPartyGainExpFlags or wPartyFoughtCurrentEnemyFlags -EnemySendOutFirstMon: ; 3c92a (f:492a) +EnemySendOutFirstMon: xor a ld hl,wEnemyStatsToDouble ; clear enemy statuses ld [hli],a @@ -1529,17 +1529,17 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) call SaveScreenTilesToBuffer1 jp SwitchPlayerMon -TrainerAboutToUseText: ; 3ca79 (f:4a79) +TrainerAboutToUseText: TX_FAR _TrainerAboutToUseText db "@" -TrainerSentOutText: ; 3ca7e (f:4a7e) +TrainerSentOutText: TX_FAR _TrainerSentOutText db "@" ; tests if the player has any pokemon that are not fainted ; sets d = 0 if all fainted, d != 0 if some mons are still alive -AnyPartyAlive: ; 3ca83 (f:4a83) +AnyPartyAlive: ld a, [wPartyCount] ld e, a xor a @@ -1557,7 +1557,7 @@ AnyPartyAlive: ; 3ca83 (f:4a83) ; tests if player mon has fainted ; stores whether mon has fainted in Z flag -HasMonFainted: ; 3ca97 (f:4a97) +HasMonFainted: ld a, [wWhichPokemon] ld hl, wPartyMon1HP ld bc, wPartyMon2 - wPartyMon1 @@ -1574,13 +1574,13 @@ HasMonFainted: ; 3ca97 (f:4a97) xor a ret -NoWillText: ; 3cab4 (f:4ab4) +NoWillText: TX_FAR _NoWillText db "@" ; try to run from battle (hl = player speed, de = enemy speed) ; stores whether the attempt was successful in carry flag -TryRunningFromBattle: ; 3cab9 (f:4ab9) +TryRunningFromBattle: call IsGhostBattle jp z, .canEscape ; jump if it's a ghost battle ld a, [wBattleType] @@ -1697,20 +1697,20 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) scf ; set carry ret -CantEscapeText: ; 3cb97 (f:4b97) +CantEscapeText: TX_FAR _CantEscapeText db "@" -NoRunningText: ; 3cb9c (f:4b9c) +NoRunningText: TX_FAR _NoRunningText db "@" -GotAwayText: ; 3cba1 (f:4ba1) +GotAwayText: TX_FAR _GotAwayText db "@" ; copies from party data to battle mon data when sending out a new player mon -LoadBattleMonFromParty: ; 3cba6 (f:4ba6) +LoadBattleMonFromParty: ld a, [wWhichPokemon] ld bc, wPartyMon2 - wPartyMon1 ld hl, wPartyMon1Species @@ -1754,7 +1754,7 @@ LoadBattleMonFromParty: ; 3cba6 (f:4ba6) ret ; copies from enemy party data to current enemy mon data when sending out a new enemy mon -LoadEnemyMonFromParty: ; 3cc13 (f:4c13) +LoadEnemyMonFromParty: ld a, [wWhichPokemon] ld bc, wEnemyMon2 - wEnemyMon1 ld hl, wEnemyMons @@ -1807,7 +1807,7 @@ LoadEnemyMonFromParty: ; 3cc13 (f:4c13) ld [wEnemyMonPartyPos], a ret -SendOutMon: ; 3cc91 (f:4c91) +SendOutMon: callab PrintSendOutMonMessage ld hl, wEnemyMonHP ld a, [hli] @@ -1853,7 +1853,7 @@ SendOutMon: ; 3cc91 (f:4c91) jp SaveScreenTilesToBuffer1 ; show 2 stages of the player mon getting smaller before disappearing -AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) +AnimateRetreatingPlayerMon: coord hl, 1, 5 lb bc, 7, 7 call ClearScreenArea @@ -1883,7 +1883,7 @@ AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) jp ClearScreenArea ; reads player's current mon's HP into wBattleMonHP -ReadPlayerMonCurHPAndStatus: ; 3cd43 (f:4d43) +ReadPlayerMonCurHPAndStatus: ld a, [wPlayerMonNumber] ld hl, wPartyMon1HP ld bc, wPartyMon2 - wPartyMon1 @@ -1894,11 +1894,11 @@ ReadPlayerMonCurHPAndStatus: ; 3cd43 (f:4d43) ld bc, $4 ; 2 bytes HP, 1 byte unknown (unused?), 1 byte status jp CopyData -DrawHUDsAndHPBars: ; 3cd5a (f:4d5a) +DrawHUDsAndHPBars: call DrawPlayerHUDAndHPBar jp DrawEnemyHUDAndHPBar -DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) +DrawPlayerHUDAndHPBar: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 9, 7 @@ -1959,7 +1959,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) set 7, [hl] ;enable low health alarm ret -DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec) +DrawEnemyHUDAndHPBar: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 0, 0 @@ -2049,7 +2049,7 @@ DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec) ld [H_AUTOBGTRANSFERENABLED], a ld hl, wEnemyHPBarColor -GetBattleHealthBarColor: ; 3ce90 (f:4e90) +GetBattleHealthBarColor: ld b, [hl] call GetHealthBarColor ld a, [hl] @@ -2063,7 +2063,7 @@ GetBattleHealthBarColor: ; 3ce90 (f:4e90) ; (i.e. for names longer than 4 letters) ; if the name is 3 or 4 letters long, it is printed 1 space more to the right than usual ; (i.e. for names longer than 4 letters) -CenterMonName: ; 3ce9c (f:4e9c) +CenterMonName: push de inc hl inc hl @@ -2084,7 +2084,7 @@ CenterMonName: ; 3ce9c (f:4e9c) pop de ret -DisplayBattleMenu: ; 3ceb3 (f:4eb3) +DisplayBattleMenu: call LoadScreenTilesFromBuffer1 ; restore saved screen ld a, [wBattleType] and a @@ -2498,7 +2498,7 @@ PartyMenuOrRockOrRun: call GBPalNormal ; fall through to SwitchPlayerMon -SwitchPlayerMon: ; 3d1ba (f:51ba) +SwitchPlayerMon: callab RetreatMon ld c, 50 call DelayFrames @@ -2521,11 +2521,11 @@ SwitchPlayerMon: ; 3d1ba (f:51ba) and a ret -AlreadyOutText: ; 3d1f5 (f:51f5) +AlreadyOutText: TX_FAR _AlreadyOutText db "@" -BattleMenu_RunWasSelected: ; 3d1fa (f:51fa) +BattleMenu_RunWasSelected: call LoadScreenTilesFromBuffer1 ld a, $3 ld [wCurrentMenuItem], a @@ -2540,7 +2540,7 @@ BattleMenu_RunWasSelected: ; 3d1fa (f:51fa) ret nz ; return if the player couldn't escape jp DisplayBattleMenu -MoveSelectionMenu: ; 3d219 (f:5219) +MoveSelectionMenu: ld a, [wMoveMenuType] dec a jr z, .mimicmenu @@ -2658,7 +2658,7 @@ MoveSelectionMenu: ; 3d219 (f:5219) ld [hl], a ; fallthrough -SelectMenuItem: ; 3d2fe (f:52fe) +SelectMenuItem: ld a, [wMoveMenuType] and a jr z, .battleselect @@ -2753,18 +2753,18 @@ SelectMenuItem: ; 3d2fe (f:52fe) call LoadScreenTilesFromBuffer1 jp MoveSelectionMenu -MoveNoPPText: ; 3d3ae (f:53ae) +MoveNoPPText: TX_FAR _MoveNoPPText db "@" -MoveDisabledText: ; 3d3b3 (f:53b3) +MoveDisabledText: TX_FAR _MoveDisabledText db "@" -WhichTechniqueString: ; 3d3b8 (f:53b8) +WhichTechniqueString: db "WHICH TECHNIQUE?@" -CursorUp: ; 3d3c9 (f:53c9) +CursorUp: ld a, [wCurrentMenuItem] and a jp nz, SelectMenuItem @@ -2774,7 +2774,7 @@ CursorUp: ; 3d3c9 (f:53c9) ld [wCurrentMenuItem], a jp SelectMenuItem -CursorDown: ; 3d3dd (f:53dd) +CursorDown: ld a, [wCurrentMenuItem] ld b, a ld a, [wNumMovesMinusOne] @@ -2787,7 +2787,7 @@ CursorDown: ; 3d3dd (f:53dd) ld [wCurrentMenuItem], a jp SelectMenuItem -AnyMoveToSelect: ; 3d3f5 (f:53f5) +AnyMoveToSelect: ; return z and Struggle as the selected move if all moves have 0 PP and/or are disabled ld a, STRUGGLE ld [wPlayerSelectedMove], a @@ -2830,11 +2830,11 @@ AnyMoveToSelect: ; 3d3f5 (f:53f5) xor a ret -NoMovesLeftText: ; 3d430 (f:5430) +NoMovesLeftText: TX_FAR _NoMovesLeftText db "@" -SwapMovesInMenu: ; 3d435 (f:5435) +SwapMovesInMenu: ld a, [wMenuItemToSwap] and a jr z, .noMenuItemSelected @@ -2910,7 +2910,7 @@ SwapMovesInMenu: ; 3d435 (f:5435) ld [wMenuItemToSwap], a ; select the current menu item for swapping jp MoveSelectionMenu -PrintMenuItem: ; 3d4b6 (f:54b6) +PrintMenuItem: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 0, 8 @@ -2981,13 +2981,13 @@ PrintMenuItem: ; 3d4b6 (f:54b6) ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -DisabledText: ; 3d555 (f:5555) +DisabledText: db "disabled!@" -TypeText: ; 3d55f (f:555f) +TypeText: db "TYPE@" -SelectEnemyMove: ; 3d564 (f:5564) +SelectEnemyMove: ld a, [wLinkState] sub LINK_STATE_BATTLING jr nz, .noLinkBattle @@ -3080,7 +3080,7 @@ SelectEnemyMove: ; 3d564 (f:5564) jr .done ; this appears to exchange data with the other gameboy during link battles -LinkBattleExchangeData: ; 3d605 (f:5605) +LinkBattleExchangeData: ld a, $ff ld [wSerialExchangeNybbleReceiveData], a ld a, [wPlayerMoveListIndex] @@ -3128,7 +3128,7 @@ LinkBattleExchangeData: ; 3d605 (f:5605) jr nz, .syncLoop3 ret -ExecutePlayerMove: ; 3d65e (f:565e) +ExecutePlayerMove: xor a ld [H_WHOSETURN], a ; set player's turn ld a, [wPlayerSelectedMove] @@ -3156,7 +3156,7 @@ ExecutePlayerMove: ; 3d65e (f:565e) call CheckForDisobedience jp z, ExecutePlayerMoveDone -CheckIfPlayerNeedsToChargeUp: ; 3d69a (f:569a) +CheckIfPlayerNeedsToChargeUp: ld a, [wPlayerMoveEffect] cp CHARGE_EFFECT jp z, JumpMoveEffect @@ -3165,13 +3165,13 @@ CheckIfPlayerNeedsToChargeUp: ; 3d69a (f:569a) jr PlayerCanExecuteMove ; in-battle stuff -PlayerCanExecuteChargingMove: ; 3d6a9 (f:56a9) +PlayerCanExecuteChargingMove: ld hl,wPlayerBattleStatus1 res ChargingUp,[hl] ; reset charging up and invulnerability statuses if mon was charging up for an attack ; being fully paralyzed or hurting oneself in confusion removes charging up status ; resulting in the Pokemon being invulnerable for the whole battle res Invulnerable,[hl] -PlayerCanExecuteMove: ; 3d6b0 (f:56b0) +PlayerCanExecuteMove: call PrintMonName1Text ld hl,DecrementPP ld de,wPlayerSelectedMove ; pointer to the move just used @@ -3188,7 +3188,7 @@ PlayerCanExecuteMove: ; 3d6b0 (f:56b0) ld de,1 call IsInArray call c,JumpMoveEffect ; execute the effects of SpecialEffectsCont moves (e.g. Wrap, Thrash) but don't skip anything -PlayerCalcMoveDamage: ; 3d6dc (f:56dc) +PlayerCalcMoveDamage: ld a,[wPlayerMoveEffect] ld hl,SetDamageEffects ld de,1 @@ -3325,17 +3325,17 @@ MirrorMoveCheck ; Responsible for executing Twineedle's second side effect (poison). jp ExecutePlayerMoveDone -MultiHitText: ; 3d805 (f:5805) +MultiHitText: TX_FAR _MultiHitText db "@" -ExecutePlayerMoveDone: ; 3d80a (f:580a) +ExecutePlayerMoveDone: xor a ld [wActionResultOrTookBattleTurn],a ld b,1 ret -PrintGhostText: ; 3d811 (f:5811) +PrintGhostText: ; print the ghost battle messages call IsGhostBattle ret nz @@ -3355,15 +3355,15 @@ PrintGhostText: ; 3d811 (f:5811) xor a ret -ScaredText: ; 3d830 (f:5830) +ScaredText: TX_FAR _ScaredText db "@" -GetOutText: ; 3d835 (f:5835) +GetOutText: TX_FAR _GetOutText db "@" -IsGhostBattle: ; 3d83a (f:583a) +IsGhostBattle: ld a,[wIsInBattle] dec a ret nz @@ -3382,7 +3382,7 @@ IsGhostBattle: ; 3d83a (f:583a) ; checks for various status conditions affecting the player mon ; stores whether the mon cannot use a move this turn in Z flag -CheckPlayerStatusConditions: ; 3d854 (f:5854) +CheckPlayerStatusConditions: ld hl,wBattleMonStatus ld a,[hl] and a,SLP ; sleep mask @@ -3643,67 +3643,67 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) and a ret -FastAsleepText: ; 3da3d (f:5a3d) +FastAsleepText: TX_FAR _FastAsleepText db "@" -WokeUpText: ; 3da42 (f:5a42) +WokeUpText: TX_FAR _WokeUpText db "@" -IsFrozenText: ; 3da47 (f:5a47) +IsFrozenText: TX_FAR _IsFrozenText db "@" -FullyParalyzedText: ; 3da4c (f:5a4c) +FullyParalyzedText: TX_FAR _FullyParalyzedText db "@" -FlinchedText: ; 3da51 (f:5a51) +FlinchedText: TX_FAR _FlinchedText db "@" -MustRechargeText: ; 3da56 (f:5a56) +MustRechargeText: TX_FAR _MustRechargeText db "@" -DisabledNoMoreText: ; 3da5b (f:5a5b) +DisabledNoMoreText: TX_FAR _DisabledNoMoreText db "@" -IsConfusedText: ; 3da60 (f:5a60) +IsConfusedText: TX_FAR _IsConfusedText db "@" -HurtItselfText: ; 3da65 (f:5a65) +HurtItselfText: TX_FAR _HurtItselfText db "@" -ConfusedNoMoreText: ; 3da6a (f:5a6a) +ConfusedNoMoreText: TX_FAR _ConfusedNoMoreText db "@" -SavingEnergyText: ; 3da6f (f:5a6f) +SavingEnergyText: TX_FAR _SavingEnergyText db "@" -UnleashedEnergyText: ; 3da74 (f:5a74) +UnleashedEnergyText: TX_FAR _UnleashedEnergyText db "@" -ThrashingAboutText: ; 3da79 (f:5a79) +ThrashingAboutText: TX_FAR _ThrashingAboutText db "@" -AttackContinuesText: ; 3da7e (f:5a7e) +AttackContinuesText: TX_FAR _AttackContinuesText db "@" -CantMoveText: ; 3da83 (f:5a83) +CantMoveText: TX_FAR _CantMoveText db "@" -PrintMoveIsDisabledText: ; 3da88 (f:5a88) +PrintMoveIsDisabledText: ld hl, wPlayerSelectedMove ld de, wPlayerBattleStatus1 ld a, [H_WHOSETURN] @@ -3721,11 +3721,11 @@ PrintMoveIsDisabledText: ; 3da88 (f:5a88) ld hl, MoveIsDisabledText jp PrintText -MoveIsDisabledText: ; 3daa8 (f:5aa8) +MoveIsDisabledText: TX_FAR _MoveIsDisabledText db "@" -HandleSelfConfusionDamage: ; 3daad (f:5aad) +HandleSelfConfusionDamage: ld hl, HurtItselfText call PrintText ld hl, wEnemyMonDefense @@ -3769,7 +3769,7 @@ HandleSelfConfusionDamage: ; 3daad (f:5aad) ld [H_WHOSETURN], a jp ApplyDamageToPlayerPokemon -PrintMonName1Text: ; 3daf5 (f:5af5) +PrintMonName1Text: ld hl, MonName1Text jp PrintText @@ -3778,7 +3778,7 @@ PrintMonName1Text: ; 3daf5 (f:5af5) ; those text strings are identical and both continue at PrintInsteadText ; this likely had to do with Japanese grammar that got translated, ; but the functionality didn't get removed -MonName1Text: ; 3dafb (f:5afb) +MonName1Text: TX_FAR _MonName1Text TX_ASM ld a, [H_WHOSETURN] @@ -3803,33 +3803,33 @@ MonName1Text: ; 3dafb (f:5afb) ld hl, Used1Text ret -Used1Text: ; 3db2d (f:5b2d) +Used1Text: TX_FAR _Used1Text TX_ASM jr PrintInsteadText -Used2Text: ; 3db34 (f:5b34) +Used2Text: TX_FAR _Used2Text TX_ASM ; fall through -PrintInsteadText: ; 3db39 (f:5b39) +PrintInsteadText: ld a, [wMonIsDisobedient] and a jr z, PrintMoveName ld hl, InsteadText ret -InsteadText: ; 3db43 (f:5b43) +InsteadText: TX_FAR _InsteadText TX_ASM ; fall through -PrintMoveName: ; 3db48 (f:5b48) +PrintMoveName: ld hl, _PrintMoveName ret -_PrintMoveName: ; 3db4c (f:5b4c) +_PrintMoveName: TX_FAR _CF4BText TX_ASM ld hl, ExclamationPointPointerTable @@ -3845,30 +3845,30 @@ _PrintMoveName: ; 3db4c (f:5b4c) ld l, a ret -ExclamationPointPointerTable: ; 3db62 (f:5b62) +ExclamationPointPointerTable: dw ExclamationPoint1Text dw ExclamationPoint2Text dw ExclamationPoint3Text dw ExclamationPoint4Text dw ExclamationPoint5Text -ExclamationPoint1Text: ; 3db6c (f:5b6c) +ExclamationPoint1Text: TX_FAR _ExclamationPoint1Text db "@" -ExclamationPoint2Text: ; 3db71 (f:5b71) +ExclamationPoint2Text: TX_FAR _ExclamationPoint2Text db "@" -ExclamationPoint3Text: ; 3db76 (f:5b76) +ExclamationPoint3Text: TX_FAR _ExclamationPoint3Text db "@" -ExclamationPoint4Text: ; 3db7b (f:5b7b) +ExclamationPoint4Text: TX_FAR _ExclamationPoint4Text db "@" -ExclamationPoint5Text: ; 3db80 (f:5b80) +ExclamationPoint5Text: TX_FAR _ExclamationPoint5Text db "@" @@ -3879,7 +3879,7 @@ ExclamationPoint5Text: ; 3db80 (f:5b80) ; but all five text strings are identical ; this likely had to do with Japanese grammar that got translated, ; but the functionality didn't get removed -DetermineExclamationPointTextNum: ; 3db85 (f:5b85) +DetermineExclamationPointTextNum: push bc ld a, [wd11e] ; move ID ld c, a @@ -3901,7 +3901,7 @@ DetermineExclamationPointTextNum: ; 3db85 (f:5b85) pop bc ret -ExclamationPointMoveSets: ; 3dba3 (f:5ba3) +ExclamationPointMoveSets: db SWORDS_DANCE, GROWTH db $00 db RECOVER, BIDE, SELFDESTRUCT, AMNESIA @@ -3916,7 +3916,7 @@ ExclamationPointMoveSets: ; 3dba3 (f:5ba3) db $00 db $FF ; terminator -PrintMoveFailureText: ; 3dbe2 (f:5be2) +PrintMoveFailureText: ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] and a @@ -3973,28 +3973,28 @@ PrintMoveFailureText: ; 3dbe2 (f:5be2) .enemyTurn jp ApplyDamageToEnemyPokemon -AttackMissedText: ; 3dc42 (f:5c42) +AttackMissedText: TX_FAR _AttackMissedText db "@" -KeptGoingAndCrashedText: ; 3dc47 (f:5c47) +KeptGoingAndCrashedText: TX_FAR _KeptGoingAndCrashedText db "@" -UnaffectedText: ; 3dc4c (f:5c4c) +UnaffectedText: TX_FAR _UnaffectedText db "@" -PrintDoesntAffectText: ; 3dc51 (f:5c51) +PrintDoesntAffectText: ld hl, DoesntAffectMonText jp PrintText -DoesntAffectMonText: ; 3dc57 (f:5c57) +DoesntAffectMonText: TX_FAR _DoesntAffectMonText db "@" ; if there was a critical hit or an OHKO was successful, print the corresponding text -PrintCriticalOHKOText: ; 3dc5c (f:5c5c) +PrintCriticalOHKOText: ld a, [wCriticalHitOrOHKO] and a jr z, .done ; do nothing if there was no critical hit or successful OHKO @@ -4014,21 +4014,21 @@ PrintCriticalOHKOText: ; 3dc5c (f:5c5c) ld c, 20 jp DelayFrames -CriticalOHKOTextPointers: ; 3dc7a (f:5c7a) +CriticalOHKOTextPointers: dw CriticalHitText dw OHKOText -CriticalHitText: ; 3dc7e (f:5c7e) +CriticalHitText: TX_FAR _CriticalHitText db "@" -OHKOText: ; 3dc83 (f:5c83) +OHKOText: TX_FAR _OHKOText db "@" ; checks if a traded mon will disobey due to lack of badges ; stores whether the mon will use a move in Z flag -CheckForDisobedience: ; 3dc88 (f:5c88) +CheckForDisobedience: xor a ld [wMonIsDisobedient], a ld a, [wLinkState] @@ -4207,28 +4207,28 @@ CheckForDisobedience: ; 3dc88 (f:5c88) xor a ; set Z flag ret -LoafingAroundText: ; 3ddb6 (f:5db6) +LoafingAroundText: TX_FAR _LoafingAroundText db "@" -BeganToNapText: ; 3ddbb (f:5dbb) +BeganToNapText: TX_FAR _BeganToNapText db "@" -WontObeyText: ; 3ddc0 (f:5dc0) +WontObeyText: TX_FAR _WontObeyText db "@" -TurnedAwayText: ; 3ddc5 (f:5dc5) +TurnedAwayText: TX_FAR _TurnedAwayText db "@" -IgnoredOrdersText: ; 3ddca (f:5dca) +IgnoredOrdersText: TX_FAR _IgnoredOrdersText db "@" ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the player mon -GetDamageVarsForPlayerAttack: ; 3ddcf (f:5dcf) +GetDamageVarsForPlayerAttack: xor a ld hl, wDamage ; damage to eventually inflict, initialise to zero ldi [hl], a @@ -4341,7 +4341,7 @@ GetDamageVarsForPlayerAttack: ; 3ddcf (f:5dcf) ret ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the enemy mon -GetDamageVarsForEnemyAttack: ; 3de75 (f:5e75) +GetDamageVarsForEnemyAttack: ld hl, wDamage ; damage to eventually inflict, initialise to zero xor a ld [hli], a @@ -4456,7 +4456,7 @@ GetDamageVarsForEnemyAttack: ; 3de75 (f:5e75) ; get stat c of enemy mon ; c: stat to get (HP=1,Attack=2,Defense=3,Speed=4,Special=5) -GetEnemyMonStat: ; 3df1c (f:5f1c) +GetEnemyMonStat: push de push bc ld a, [wLinkState] @@ -4497,7 +4497,7 @@ GetEnemyMonStat: ; 3df1c (f:5f1c) pop de ret -CalculateDamage: ; 3df65 (f:5f65) +CalculateDamage: ; input: ; b: attack ; c: opponent defense @@ -4659,14 +4659,14 @@ CalculateDamage: ; 3df65 (f:5f65) and a ret -JumpToOHKOMoveEffect: ; 3e016 (f:6016) +JumpToOHKOMoveEffect: call JumpMoveEffect ld a, [wMoveMissed] dec a ret -UnusedHighCriticalMoves: ; 3e01e (f:601e) +UnusedHighCriticalMoves: db KARATE_CHOP db RAZOR_LEAF db CRABHAMMER @@ -4677,7 +4677,7 @@ UnusedHighCriticalMoves: ; 3e01e (f:601e) ; determines if attack is a critical hit ; azure heights claims "the fastest pokémon (who are,not coincidentally, ; among the most popular) tend to CH about 20 to 25% of the time." -CriticalHitTest: ; 3e023 (f:6023) +CriticalHitTest: xor a ld [wCriticalHitOrOHKO], a ld a, [H_WHOSETURN] @@ -4744,7 +4744,7 @@ CriticalHitTest: ; 3e023 (f:6023) ret ; high critical hit moves -HighCriticalMoves: ; 3e08e (f:608e) +HighCriticalMoves: db KARATE_CHOP db RAZOR_LEAF db CRABHAMMER @@ -4753,7 +4753,7 @@ HighCriticalMoves: ; 3e08e (f:608e) ; function to determine if Counter hits and if so, how much damage it does -HandleCounterMove: ; 3e093 (f:6093) +HandleCounterMove: ; The variables checked by Counter are updated whenever the cursor points to a new move in the battle selection menu. ; This is irrelevant for the opponent's side outside of link battles, since the move selection is controlled by the AI. ; However, in the scenario where the player switches out and the opponent uses Counter, @@ -4818,7 +4818,7 @@ HandleCounterMove: ; 3e093 (f:6093) xor a ret -ApplyAttackToEnemyPokemon: ; 3e0df (f:60df) +ApplyAttackToEnemyPokemon: ld a,[wPlayerMoveEffect] cp a,OHKO_EFFECT jr z,ApplyDamageToEnemyPokemon @@ -4884,7 +4884,7 @@ ApplyAttackToEnemyPokemon: ; 3e0df (f:60df) ld a,b ld [hl],a -ApplyDamageToEnemyPokemon: ; 3e142 (f:6142) +ApplyDamageToEnemyPokemon: ld hl,wDamage ld a,[hli] ld b,a @@ -4934,10 +4934,10 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142) xor a ld [wHPBarType],a predef UpdateHPBar2 ; animate the HP bar shortening -ApplyAttackToEnemyPokemonDone: ; 3e19d (f:619d) +ApplyAttackToEnemyPokemonDone: jp DrawHUDsAndHPBars -ApplyAttackToPlayerPokemon: ; 3e1a0 (f:61a0) +ApplyAttackToPlayerPokemon: ld a,[wEnemyMoveEffect] cp a,OHKO_EFFECT jr z,ApplyDamageToPlayerPokemon @@ -5003,7 +5003,7 @@ ApplyAttackToPlayerPokemon: ; 3e1a0 (f:61a0) ld a,b ld [hl],a -ApplyDamageToPlayerPokemon: ; 3e200 (f:6200) +ApplyDamageToPlayerPokemon: ld hl,wDamage ld a,[hli] ld b,a @@ -5055,7 +5055,7 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200) ApplyAttackToPlayerPokemonDone jp DrawHUDsAndHPBars -AttackSubstitute: ; 3e25e (f:625e) +AttackSubstitute: ; Unlike the two ApplyAttackToPokemon functions, Attack Substitute is shared by player and enemy. ; Self-confusion damage as well as Hi-Jump Kick and Jump Kick recoil cause a momentary turn swap before being applied. ; If the user has a Substitute up and would take damage because of that, @@ -5110,16 +5110,16 @@ AttackSubstitute: ; 3e25e (f:625e) ld [hl],a ; zero the effect of the attacker's move jp DrawHUDsAndHPBars -SubstituteTookDamageText: ; 3e2ac (f:62ac) +SubstituteTookDamageText: TX_FAR _SubstituteTookDamageText db "@" -SubstituteBrokeText: ; 3e2b1 (f:62b1) +SubstituteBrokeText: TX_FAR _SubstituteBrokeText db "@" ; this function raises the attack modifier of a pokemon using Rage when that pokemon is attacked -HandleBuildingRage: ; 3e2b6 (f:62b6) +HandleBuildingRage: ; values for the player turn ld hl,wEnemyBattleStatus2 ld de,wEnemyMonStatMods @@ -5161,13 +5161,13 @@ HandleBuildingRage: ; 3e2b6 (f:62b6) ld [H_WHOSETURN],a ret -BuildingRageText: ; 3e2f8 (f:62f8) +BuildingRageText: TX_FAR _BuildingRageText db "@" ; copy last move for Mirror Move ; sets zero flag on failure and unsets zero flag on success -MirrorMoveCopyMove: ; 3e2fd (f:62fd) +MirrorMoveCopyMove: ; Mirror Move makes use of ccf1 (wPlayerUsedMove) and ccf2 (wEnemyUsedMove) addresses, ; which are mainly used to print the "[Pokemon] used [Move]" text. ; Both are set to 0 whenever a new Pokemon is sent out @@ -5197,12 +5197,12 @@ MirrorMoveCopyMove: ; 3e2fd (f:62fd) xor a ret -MirrorMoveFailedText: ; 3e324 (f:6324) +MirrorMoveFailedText: TX_FAR _MirrorMoveFailedText db "@" ; function used to reload move data for moves like Mirror Move and Metronome -ReloadMoveData: ; 3e329 (f:6329) +ReloadMoveData: ld [wd11e],a dec a ld hl,Moves @@ -5219,7 +5219,7 @@ ReloadMoveData: ; 3e329 (f:6329) ret ; function that picks a random move for metronome -MetronomePickMove: ; 3e348 (f:6348) +MetronomePickMove: xor a ld [wAnimationType],a ld a,METRONOME @@ -5248,7 +5248,7 @@ MetronomePickMove: ; 3e348 (f:6348) ; this function increments the current move's PP ; it's used to prevent moves that run another move within the same turn ; (like Mirror Move and Metronome) from losing 2 PP -IncrementMovePP: ; 3e373 (f:6373) +IncrementMovePP: ld a,[H_WHOSETURN] and a ; values for player turn @@ -5280,7 +5280,7 @@ IncrementMovePP: ; 3e373 (f:6373) ret ; function to adjust the base damage of an attack to account for type effectiveness -AdjustDamageForMoveType: ; 3e3a5 (f:63a5) +AdjustDamageForMoveType: ; values for player turn ld hl,wBattleMonType ld a,[hli] @@ -5399,7 +5399,7 @@ AdjustDamageForMoveType: ; 3e3a5 (f:63a5) ; the result is stored in [wTypeEffectiveness] ; ($05 is not very effective, $10 is neutral, $14 is super effective) ; as far is can tell, this is only used once in some AI code to help decide which move to use -AIGetTypeEffectiveness: ; 3e449 (f:6449) +AIGetTypeEffectiveness: ld a,[wEnemyMoveType] ld d,a ; d = type of enemy move ld hl,wBattleMonType @@ -5434,7 +5434,7 @@ AIGetTypeEffectiveness: ; 3e449 (f:6449) INCLUDE "data/type_effects.asm" ; some tests that need to pass for a move to hit -MoveHitTest: ; 3e56b (f:656b) +MoveHitTest: ; player's turn ld hl,wEnemyBattleStatus1 ld de,wPlayerMoveEffect @@ -5554,7 +5554,7 @@ MoveHitTest: ; 3e56b (f:656b) ret ; values for player turn -CalcHitChance: ; 3e624 (f:6624) +CalcHitChance: ld hl,wPlayerMoveAccuracy ld a,[H_WHOSETURN] and a @@ -5626,7 +5626,7 @@ CalcHitChance: ; 3e624 (f:6624) ret ; multiplies damage by a random percentage from ~85% to 100% -RandomizeDamage: ; 3e687 (f:6687) +RandomizeDamage: ld hl, wDamage ld a, [hli] and a @@ -5663,7 +5663,7 @@ RandomizeDamage: ; 3e687 (f:6687) ret ; for more detailed commentary, see equivalent function for player side (ExecutePlayerMove) -ExecuteEnemyMove: ; 3e6bc (f:66bc) +ExecuteEnemyMove: ld a, [wEnemySelectedMove] inc a jp z, ExecuteEnemyMoveDone @@ -5695,14 +5695,14 @@ ExecuteEnemyMove: ; 3e6bc (f:66bc) jr nz, EnemyCanExecuteChargingMove ; if so, jump call GetCurrentMove -CheckIfEnemyNeedsToChargeUp: ; 3e6fc (f:66fc) +CheckIfEnemyNeedsToChargeUp: ld a, [wEnemyMoveEffect] cp CHARGE_EFFECT jp z, JumpMoveEffect cp FLY_EFFECT jp z, JumpMoveEffect jr EnemyCanExecuteMove -EnemyCanExecuteChargingMove: ; 3e70b (f:670b) +EnemyCanExecuteChargingMove: ld hl, wEnemyBattleStatus1 res ChargingUp, [hl] ; no longer charging up for attack res Invulnerable, [hl] ; no longer invulnerable to typical attacks @@ -5715,7 +5715,7 @@ EnemyCanExecuteChargingMove: ; 3e70b (f:670b) call GetName ld de, wcd6d call CopyStringToCF4B -EnemyCanExecuteMove: ; 3e72b (f:672b) +EnemyCanExecuteMove: xor a ld [wMonIsDisobedient], a call PrintMonName1Text @@ -5729,7 +5729,7 @@ EnemyCanExecuteMove: ; 3e72b (f:672b) ld de, $1 call IsInArray call c, JumpMoveEffect -EnemyCalcMoveDamage: ; 3e750 (f:6750) +EnemyCalcMoveDamage: call SwapPlayerAndEnemyLevels ld a, [wEnemyMoveEffect] ld hl, SetDamageEffects @@ -5747,9 +5747,9 @@ EnemyCalcMoveDamage: ; 3e750 (f:6750) call AdjustDamageForMoveType call RandomizeDamage -EnemyMoveHitTest: ; 3e77f (f:677f) +EnemyMoveHitTest: call MoveHitTest -handleIfEnemyMoveMissed: ; 3e782 (f:6782) +handleIfEnemyMoveMissed: ld a, [wMoveMissed] and a jr z, .asm_3e791 @@ -5760,17 +5760,17 @@ handleIfEnemyMoveMissed: ; 3e782 (f:6782) .asm_3e791 call SwapPlayerAndEnemyLevels -GetEnemyAnimationType: ; 3e794 (f:6794) +GetEnemyAnimationType: ld a, [wEnemyMoveEffect] and a ld a, $1 jr z, playEnemyMoveAnimation ld a, $2 jr playEnemyMoveAnimation -asm_3e7a0: ; 3e7a0 (f:67a0) +asm_3e7a0: call SwapPlayerAndEnemyLevels xor a -playEnemyMoveAnimation: ; 3e7a4 (f:67a4) +playEnemyMoveAnimation: push af ld a, [wEnemyBattleStatus2] bit HasSubstituteUp, a ; does mon have a substitute? @@ -5790,7 +5790,7 @@ playEnemyMoveAnimation: ; 3e7a4 (f:67a4) call nz, Bankswitch ; slide the substitute's sprite out jr EnemyCheckIfMirrorMoveEffect -EnemyCheckIfFlyOrChargeEffect: ; 3e7d1 (f:67d1) +EnemyCheckIfFlyOrChargeEffect: call SwapPlayerAndEnemyLevels ld c, 30 call DelayFrames @@ -5805,7 +5805,7 @@ EnemyCheckIfFlyOrChargeEffect: ; 3e7d1 (f:67d1) ld [wAnimationType], a ld a,STATUS_AFFECTED_ANIM call PlayMoveAnimation -EnemyCheckIfMirrorMoveEffect: ; 3e7ef (f:67ef) +EnemyCheckIfMirrorMoveEffect: ld a, [wEnemyMoveEffect] cp MIRROR_MOVE_EFFECT jr nz, .notMirrorMoveEffect @@ -5872,17 +5872,17 @@ EnemyCheckIfMirrorMoveEffect: ; 3e7ef (f:67ef) call nc, JumpMoveEffect jr ExecuteEnemyMoveDone -HitXTimesText: ; 3e887 (f:6887) +HitXTimesText: TX_FAR _HitXTimesText db "@" -ExecuteEnemyMoveDone: ; 3e88c (f:688c) +ExecuteEnemyMoveDone: ld b, $1 ret ; checks for various status conditions affecting the enemy mon ; stores whether the mon cannot use a move this turn in Z flag -CheckEnemyStatusConditions: ; 3e88f (f:688f) +CheckEnemyStatusConditions: ld hl, wEnemyMonStatus ld a, [hl] and SLP ; sleep mask @@ -6164,7 +6164,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) and a ; clear Z flag ret -GetCurrentMove: ; 3eabe (f:6abe) +GetCurrentMove: ld a, [H_WHOSETURN] and a jp z, .player @@ -6195,7 +6195,7 @@ GetCurrentMove: ; 3eabe (f:6abe) ld de, wcd6d jp CopyStringToCF4B -LoadEnemyMonData: ; 3eb01 (f:6b01) +LoadEnemyMonData: ld a, [wLinkState] cp LINK_STATE_BATTLING jp z, LoadEnemyMonFromParty @@ -6355,7 +6355,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) ret ; calls BattleTransition to show the battle transition animation and initializes some battle variables -DoBattleTransitionAndInitBattleVariables: ; 3ec32 (f:6c32) +DoBattleTransitionAndInitBattleVariables: ld a, [wLinkState] cp LINK_STATE_BATTLING jr nz, .next @@ -6391,7 +6391,7 @@ DoBattleTransitionAndInitBattleVariables: ; 3ec32 (f:6c32) ret ; swaps the level values of the BattleMon and EnemyMon structs -SwapPlayerAndEnemyLevels: ; 3ec81 (f:6c81) +SwapPlayerAndEnemyLevels: push bc ld a, [wBattleMonLevel] ld b, a @@ -6405,7 +6405,7 @@ SwapPlayerAndEnemyLevels: ; 3ec81 (f:6c81) ; loads either red back pic or old man back pic ; also writes OAM data and loads tile patterns for the Red or Old Man back sprite's head ; (for use when scrolling the player sprite and enemy's silhouettes on screen) -LoadPlayerBackPic: ; 3ec92 (f:6c92) +LoadPlayerBackPic: ld a, [wBattleType] dec a ; is it the old man tutorial? ld de, RedPicBack @@ -6466,26 +6466,26 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) predef_jump CopyUncompressedPicToTilemap ; does nothing since no stats are ever selected (barring glitches) -DoubleOrHalveSelectedStats: ; 3ed02 (f:6d02) +DoubleOrHalveSelectedStats: callab DoubleSelectedStats jpab HalveSelectedStats -ScrollTrainerPicAfterBattle: ; 3ed12 (f:6d12) +ScrollTrainerPicAfterBattle: jpab _ScrollTrainerPicAfterBattle -ApplyBurnAndParalysisPenaltiesToPlayer: ; 3ed1a (f:6d1a) +ApplyBurnAndParalysisPenaltiesToPlayer: ld a, $1 jr ApplyBurnAndParalysisPenalties -ApplyBurnAndParalysisPenaltiesToEnemy: ; 3ed1e (f:6d1e) +ApplyBurnAndParalysisPenaltiesToEnemy: xor a -ApplyBurnAndParalysisPenalties: ; 3ed1f (f:6d1f) +ApplyBurnAndParalysisPenalties: ld [H_WHOSETURN], a call QuarterSpeedDueToParalysis jp HalveAttackDueToBurn -QuarterSpeedDueToParalysis: ; 3ed27 (f:6d27) +QuarterSpeedDueToParalysis: ld a, [H_WHOSETURN] and a jr z, .playerTurn @@ -6528,7 +6528,7 @@ QuarterSpeedDueToParalysis: ; 3ed27 (f:6d27) ld [hl], b ret -HalveAttackDueToBurn: ; 3ed64 (f:6d64) +HalveAttackDueToBurn: ld a, [H_WHOSETURN] and a jr z, .playerTurn @@ -6567,7 +6567,7 @@ HalveAttackDueToBurn: ; 3ed64 (f:6d64) ld [hl], b ret -CalculateModifiedStats: ; 3ed99 (f:6d99) +CalculateModifiedStats: ld c, 0 .loop call CalculateModifiedStat @@ -6578,7 +6578,7 @@ CalculateModifiedStats: ; 3ed99 (f:6d99) ret ; calculate modified stat for stat c (0 = attack, 1 = defense, 2 = speed, 3 = special) -CalculateModifiedStat: ; 3eda5 (f:6da5) +CalculateModifiedStat: push bc push bc ld a, [wCalculateWhoseStats] @@ -6656,7 +6656,7 @@ CalculateModifiedStat: ; 3eda5 (f:6da5) pop bc ret -ApplyBadgeStatBoosts: ; 3ee19 (f:6e19) +ApplyBadgeStatBoosts: ld a, [wLinkState] cp LINK_STATE_BATTLING ret z ; return if link battle @@ -6709,10 +6709,10 @@ ApplyBadgeStatBoosts: ; 3ee19 (f:6e19) ld [hld], a ret -LoadHudAndHpBarAndStatusTilePatterns: ; 3ee58 (f:6e58) +LoadHudAndHpBarAndStatusTilePatterns: call LoadHpBarAndStatusTilePatterns -LoadHudTilePatterns: ; 3ee5b (f:6e5b) +LoadHudTilePatterns: ld a, [rLCDC] add a ; is LCD disabled? jr c, .lcdEnabled @@ -6737,7 +6737,7 @@ LoadHudTilePatterns: ; 3ee5b (f:6e5b) lb bc, BANK(BattleHudTiles2), (BattleHudTiles3End - BattleHudTiles2) / $8 jp CopyVideoDataDouble -PrintEmptyString: ; 3ee94 (f:6e94) +PrintEmptyString: ld hl, .emptyString jp PrintText .emptyString @@ -6796,7 +6796,7 @@ BattleRandom: ret -HandleExplodingAnimation: ; 3eed3 (f:6ed3) +HandleExplodingAnimation: ld a, [H_WHOSETURN] and a ld hl, wEnemyMonType1 @@ -6827,23 +6827,23 @@ HandleExplodingAnimation: ; 3eed3 (f:6ed3) ld a, 5 ld [wAnimationType], a -PlayMoveAnimation: ; 3ef07 (f:6f07) +PlayMoveAnimation: ld [wAnimationID],a call Delay3 predef_jump MoveAnimation -InitBattle: ; 3ef12 (f:6f12) +InitBattle: ld a, [wCurOpponent] and a jr z, DetermineWildOpponent -InitOpponent: ; 3ef18 (f:6f18) +InitOpponent: ld a, [wCurOpponent] ld [wcf91], a ld [wEnemyMonSpecies2], a jr InitBattleCommon -DetermineWildOpponent: ; 3ef23 (f:6f23) +DetermineWildOpponent: ld a, [wd732] bit 1, a jr z, .asm_3ef2f @@ -6856,7 +6856,7 @@ DetermineWildOpponent: ; 3ef23 (f:6f23) ret nz callab TryDoWildEncounter ret nz -InitBattleCommon: ; 3ef3d (f:6f3d) +InitBattleCommon: ld a, [wMapPalOffset] push af ld hl, wLetterPrintingDelayFlags @@ -6885,7 +6885,7 @@ InitBattleCommon: ; 3ef3d (f:6f3d) ld [wIsInBattle], a jp _InitBattleCommon -InitWildBattle: ; 3ef8b (f:6f8b) +InitWildBattle: ld a, $1 ld [wIsInBattle], a call LoadEnemyMonData @@ -6935,7 +6935,7 @@ InitWildBattle: ; 3ef8b (f:6f8b) predef CopyUncompressedPicToTilemap ; common code that executes after init battle code specific to trainer or wild battles -_InitBattleCommon: ; 3efeb (f:6feb) +_InitBattleCommon: ld b, SET_PAL_BATTLE_BLACK call RunPaletteCommand call SlidePlayerAndEnemySilhouettesOnScreen @@ -6976,7 +6976,7 @@ _InitBattleCommon: ; 3efeb (f:6feb) .emptyString db "@" -_LoadTrainerPic: ; 3f04b (f:704b) +_LoadTrainerPic: ; wd033-wd034 contain pointer to pic ld a, [wTrainerPicPointer] ld e, a @@ -6995,14 +6995,14 @@ _LoadTrainerPic: ; 3f04b (f:704b) jp LoadUncompressedSpriteData ; unreferenced -ResetCryModifiers: ; 3f069 (f:7069) +ResetCryModifiers: xor a ld [wFrequencyModifier], a ld [wTempoModifier], a jp PlaySound ; animates the mon "growing" out of the pokeball -AnimateSendingOutMon: ; 3f073 (f:7073) +AnimateSendingOutMon: ld a, [wPredefRegisters] ld h, a ld a, [wPredefRegisters + 1] @@ -7042,13 +7042,13 @@ AnimateSendingOutMon: ; 3f073 (f:7073) add $31 jr CopyUncompressedPicToHL -CopyUncompressedPicToTilemap: ; 3f0c6 (f:70c6) +CopyUncompressedPicToTilemap: ld a, [wPredefRegisters] ld h, a ld a, [wPredefRegisters + 1] ld l, a ld a, [hStartTileID] -CopyUncompressedPicToHL: ; 3f0d0 (f:70d0) +CopyUncompressedPicToHL: lb bc, 7, 7 ld de, SCREEN_WIDTH push af @@ -7095,7 +7095,7 @@ CopyUncompressedPicToHL: ; 3f0d0 (f:70d0) jr nz, .flippedLoop ret -LoadMonBackPic: ; 3f103 (f:7103) +LoadMonBackPic: ; Assumes the monster's attributes have ; been loaded with GetMonHeader. ld a, [wBattleMonSpecies2] @@ -7116,12 +7116,12 @@ LoadMonBackPic: ; 3f103 (f:7103) ld b, a jp CopyVideoData -JumpMoveEffect: ; 3f132 (f:7132) +JumpMoveEffect: call _JumpMoveEffect ld b, $1 ret -_JumpMoveEffect: ; 3f138 (f:7138) +_JumpMoveEffect: ld a, [H_WHOSETURN] and a ld a, [wPlayerMoveEffect] @@ -7139,7 +7139,7 @@ _JumpMoveEffect: ; 3f138 (f:7138) ld l, a jp [hl] ; jump to special effect handler -MoveEffectPointerTable: ; 3f150 (f:7150) +MoveEffectPointerTable: dw SleepEffect ; unused effect dw PoisonEffect ; POISON_SIDE_EFFECT1 dw DrainHPEffect ; DRAIN_HP_EFFECT @@ -7227,7 +7227,7 @@ MoveEffectPointerTable: ; 3f150 (f:7150) dw SplashEffect ; SPLASH_EFFECT dw DisableEffect ; DISABLE_EFFECT -SleepEffect: ; 3f1fc (f:71fc) +SleepEffect: ld de, wEnemyMonStatus ld bc, wEnemyBattleStatus2 ld a, [H_WHOSETURN] @@ -7271,15 +7271,15 @@ SleepEffect: ; 3f1fc (f:71fc) .didntAffect jp PrintDidntAffectText -FellAsleepText: ; 3f245 (f:7245) +FellAsleepText: TX_FAR _FellAsleepText db "@" -AlreadyAsleepText: ; 3f24a (f:724a) +AlreadyAsleepText: TX_FAR _AlreadyAsleepText db "@" -PoisonEffect: ; 3f24f (f:724f) +PoisonEffect: ld hl, wEnemyMonStatus ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] @@ -7365,18 +7365,18 @@ PoisonEffect: ; 3f24f (f:724f) call DelayFrames jp PrintDidntAffectText -PoisonedText: ; 3f2df (f:72df) +PoisonedText: TX_FAR _PoisonedText db "@" -BadlyPoisonedText: ; 3f2e4 (f:72e4) +BadlyPoisonedText: TX_FAR _BadlyPoisonedText db "@" -DrainHPEffect: ; 3f2e9 (f:72e9) +DrainHPEffect: jpab DrainHPEffect_ -ExplodeEffect: ; 3f2f1 (f:72f1) +ExplodeEffect: ld hl, wBattleMonHP ld de, wPlayerBattleStatus2 ld a, [H_WHOSETURN] @@ -7395,7 +7395,7 @@ ExplodeEffect: ; 3f2f1 (f:72f1) ld [de], a ret -FreezeBurnParalyzeEffect: ; 3f30c (f:730c) +FreezeBurnParalyzeEffect: xor a ld [wAnimationType], a call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag] @@ -7454,7 +7454,7 @@ FreezeBurnParalyzeEffect: ; 3f30c (f:730c) call PlayBattleAnimation ld hl, FrozenText jp PrintText -opponentAttacker: ; 3f382 (f:7382) +opponentAttacker: ld a, [wBattleMonStatus] ; mostly same as above with addresses swapped for opponent and a jp nz, CheckDefrost @@ -7500,15 +7500,15 @@ opponentAttacker: ; 3f382 (f:7382) ld hl, FrozenText jp PrintText -BurnedText: ; 3f3d8 (f:73d8) +BurnedText: TX_FAR _BurnedText db "@" -FrozenText: ; 3f3dd (f:73dd) +FrozenText: TX_FAR _FrozenText db "@" -CheckDefrost: ; 3f3e2 (f:73e2) +CheckDefrost: ; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target and a, 1 << FRZ ; are they frozen? ret z ; return if so @@ -7543,11 +7543,11 @@ CheckDefrost: ; 3f3e2 (f:73e2) .common jp PrintText -FireDefrostedText: ; 3f423 (f:7423) +FireDefrostedText: TX_FAR _FireDefrostedText db "@" -StatModifierUpEffect: ; 3f428 (f:7428) +StatModifierUpEffect: ld hl, wPlayerMonStatMods ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] @@ -7646,13 +7646,13 @@ StatModifierUpEffect: ; 3f428 (f:7428) ld a, 999 % $100 ld [H_MULTIPLICAND + 2], a -UpdateStat: ; 3f4c3 (f:74c3) +UpdateStat: ld a, [H_PRODUCT + 2] ld [hli], a ld a, [H_PRODUCT + 3] ld [hl], a pop hl -UpdateStatDone: ; 3f4ca (f:74ca) +UpdateStatDone: ld b, c inc b call PrintStatText @@ -7703,15 +7703,15 @@ UpdateStatDone: ; 3f4ca (f:74ca) call QuarterSpeedDueToParalysis ; apply speed penalty to the player whose turn is not, if it's paralyzed jp HalveAttackDueToBurn ; apply attack penalty to the player whose turn is not, if it's burned -RestoreOriginalStatModifier: ; 3f520 (f:7520) +RestoreOriginalStatModifier: pop hl dec [hl] -PrintNothingHappenedText: ; 3f522 (f:7522) +PrintNothingHappenedText: ld hl, NothingHappenedText jp PrintText -MonsStatsRoseText: ; 3f528 (f:7528) +MonsStatsRoseText: TX_FAR _MonsStatsRoseText TX_ASM ld hl, GreatlyRoseText @@ -7726,15 +7726,15 @@ MonsStatsRoseText: ; 3f528 (f:7528) ld hl, RoseText ret -GreatlyRoseText: ; 3f542 (f:7542) +GreatlyRoseText: db $0a TX_FAR _GreatlyRoseText -RoseText: ; 3f547 (f:7547) +RoseText: TX_FAR _RoseText db "@" -StatModifierDownEffect: ; 3f54c (f:754c) +StatModifierDownEffect: ld hl, wEnemyMonStatMods ld de, wPlayerMoveEffect ld bc, wEnemyBattleStatus1 @@ -7864,14 +7864,14 @@ StatModifierDownEffect: ; 3f54c (f:754c) ld a, $1 ld [H_MULTIPLICAND + 2], a -UpdateLoweredStat: ; 3f624 (f:7624) +UpdateLoweredStat: ld a, [H_PRODUCT + 2] ld [hli], a ld a, [H_PRODUCT + 3] ld [hl], a pop de pop hl -UpdateLoweredStatDone: ; 3f62c (f:762c) +UpdateLoweredStatDone: ld b, c inc b push de @@ -7895,25 +7895,25 @@ UpdateLoweredStatDone: ; 3f62c (f:762c) call QuarterSpeedDueToParalysis jp HalveAttackDueToBurn -CantLowerAnymore_Pop: ; 3f64d (f:764d) +CantLowerAnymore_Pop: pop de pop hl inc [hl] -CantLowerAnymore: ; 3f650 (f:7650) +CantLowerAnymore: ld a, [de] cp ATTACK_DOWN_SIDE_EFFECT ret nc ld hl, NothingHappenedText jp PrintText -MoveMissed: ; 3f65a (f:765a) +MoveMissed: ld a, [de] cp $44 ret nc jp ConditionalPrintButItFailed -MonsStatsFellText: ; 3f661 (f:7661) +MonsStatsFellText: TX_FAR _MonsStatsFellText TX_ASM ld hl, FellText @@ -7930,15 +7930,15 @@ MonsStatsFellText: ; 3f661 (f:7661) ld hl, GreatlyFellText ret -GreatlyFellText: ; 3f67e (f:767e) +GreatlyFellText: db $0a TX_FAR _GreatlyFellText -FellText: ; 3f683 (f:7683) +FellText: TX_FAR _FellText db "@" -PrintStatText: ; 3f688 (f:7688) +PrintStatText: ld hl, StatsTextStrings ld c, "@" .asm_3f68d @@ -7954,7 +7954,7 @@ PrintStatText: ; 3f688 (f:7688) ld bc, $a jp CopyData -StatsTextStrings: ; 3f69f (f:769f) +StatsTextStrings: db "ATTACK@" db "DEFENSE@" db "SPEED@" @@ -7962,7 +7962,7 @@ StatsTextStrings: ; 3f69f (f:769f) db "ACCURACY@" db "EVADE@" -StatModifierRatios: ; 3f6cb (f:76cb) +StatModifierRatios: ; first byte is numerator, second byte is denominator db 25, 100 ; 0.25 db 28, 100 ; 0.28 @@ -7978,7 +7978,7 @@ StatModifierRatios: ; 3f6cb (f:76cb) db 35, 10 ; 3.50 db 4, 1 ; 4.00 -BideEffect: ; 3f6e5 (f:76e5) +BideEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerBideAccumulatedDamage ld bc, wPlayerNumAttacksLeft @@ -8005,7 +8005,7 @@ BideEffect: ; 3f6e5 (f:76e5) add XSTATITEM_ANIM jp PlayBattleAnimation2 -ThrashPetalDanceEffect: ; 3f717 (f:7717) +ThrashPetalDanceEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerNumAttacksLeft ld a, [H_WHOSETURN] @@ -8024,7 +8024,7 @@ ThrashPetalDanceEffect: ; 3f717 (f:7717) add ANIM_B0 jp PlayBattleAnimation2 -SwitchAndTeleportEffect: ; 3f739 (f:7739) +SwitchAndTeleportEffect: ld a, [H_WHOSETURN] and a jr nz, .asm_3f791 @@ -8127,19 +8127,19 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) .asm_3f7ff jp PrintText -RanFromBattleText: ; 3f802 (f:7802) +RanFromBattleText: TX_FAR _RanFromBattleText db "@" -RanAwayScaredText: ; 3f807 (f:7807) +RanAwayScaredText: TX_FAR _RanAwayScaredText db "@" -WasBlownAwayText: ; 3f80c (f:780c) +WasBlownAwayText: TX_FAR _WasBlownAwayText db "@" -TwoToFiveAttacksEffect: ; 3f811 (f:7811) +TwoToFiveAttacksEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerNumAttacksLeft ld bc, wPlayerNumHits @@ -8184,7 +8184,7 @@ TwoToFiveAttacksEffect: ; 3f811 (f:7811) ld [hl], a ; set Twineedle's effect to poison effect jr .saveNumberOfHits -FlinchSideEffect: ; 3f85b (f:785b) +FlinchSideEffect: call CheckTargetSubstitute ret nz ld hl, wEnemyBattleStatus1 @@ -8208,10 +8208,10 @@ FlinchSideEffect: ; 3f85b (f:785b) call ClearHyperBeam ret -OneHitKOEffect: ; 3f884 (f:7884) +OneHitKOEffect: jpab OneHitKOEffect_ -ChargeEffect: ; 3f88c (f:788c) +ChargeEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] @@ -8245,7 +8245,7 @@ ChargeEffect: ; 3f88c (f:788c) ld hl, ChargeMoveEffectText jp PrintText -ChargeMoveEffectText: ; 3f8c8 (f:78c8) +ChargeMoveEffectText: TX_FAR _ChargeMoveEffectText TX_ASM ld a, [wChargeMoveNum] @@ -8269,31 +8269,31 @@ ChargeMoveEffectText: ; 3f8c8 (f:78c8) .asm_3f8f8 ret -MadeWhirlwindText: ; 3f8f9 (f:78f9) +MadeWhirlwindText: TX_FAR _MadeWhirlwindText db "@" -TookInSunlightText: ; 3f8fe (f:78fe) +TookInSunlightText: TX_FAR _TookInSunlightText db "@" -LoweredItsHeadText: ; 3f903 (f:7903) +LoweredItsHeadText: TX_FAR _LoweredItsHeadText db "@" -SkyAttackGlowingText: ; 3f908 (f:7908) +SkyAttackGlowingText: TX_FAR _SkyAttackGlowingText db "@" -FlewUpHighText: ; 3f90d (f:790d) +FlewUpHighText: TX_FAR _FlewUpHighText db "@" -DugAHoleText: ; 3f912 (f:7912) +DugAHoleText: TX_FAR _DugAHoleText db "@" -TrappingEffect: ; 3f917 (f:7917) +TrappingEffect: ld hl, wPlayerBattleStatus1 ld de, wPlayerNumAttacksLeft ld a, [H_WHOSETURN] @@ -8318,22 +8318,22 @@ TrappingEffect: ; 3f917 (f:7917) ld [de], a ret -MistEffect: ; 3f941 (f:7941) +MistEffect: jpab MistEffect_ -FocusEnergyEffect: ; 3f949 (f:7949) +FocusEnergyEffect: jpab FocusEnergyEffect_ -RecoilEffect: ; 3f951 (f:7951) +RecoilEffect: jpab RecoilEffect_ -ConfusionSideEffect: ; 3f959 (f:7959) +ConfusionSideEffect: call BattleRandom cp $19 ret nc jr ConfusionSideEffectSuccess -ConfusionEffect: ; 3f961 (f:7961) +ConfusionEffect: call CheckTargetSubstitute jr nz, ConfusionEffectFailed call MoveHitTest @@ -8341,7 +8341,7 @@ ConfusionEffect: ; 3f961 (f:7961) and a jr nz, ConfusionEffectFailed -ConfusionSideEffectSuccess: ; 3f96f (f:796f) +ConfusionSideEffectSuccess: ld a, [H_WHOSETURN] and a ld hl, wEnemyBattleStatus1 @@ -8367,24 +8367,24 @@ ConfusionSideEffectSuccess: ; 3f96f (f:796f) ld hl, BecameConfusedText jp PrintText -BecameConfusedText: ; 3f9a1 (f:79a1) +BecameConfusedText: TX_FAR _BecameConfusedText db "@" -ConfusionEffectFailed: ; 3f9a6 (f:79a6) +ConfusionEffectFailed: cp CONFUSION_SIDE_EFFECT ret z ld c, 50 call DelayFrames jp ConditionalPrintButItFailed -ParalyzeEffect: ; 3f9b1 (f:79b1) +ParalyzeEffect: jpab ParalyzeEffect_ -SubstituteEffect: ; 3f9b9 (f:79b9) +SubstituteEffect: jpab SubstituteEffect_ -HyperBeamEffect: ; 3f9c1 (f:79c1) +HyperBeamEffect: ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a @@ -8394,7 +8394,7 @@ HyperBeamEffect: ; 3f9c1 (f:79c1) set NeedsToRecharge, [hl] ; mon now needs to recharge ret -ClearHyperBeam: ; 3f9cf (f:79cf) +ClearHyperBeam: push hl ld hl, wEnemyBattleStatus2 ld a, [H_WHOSETURN] @@ -8406,7 +8406,7 @@ ClearHyperBeam: ; 3f9cf (f:79cf) pop hl ret -RageEffect: ; 3f9df (f:79df) +RageEffect: ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a @@ -8416,7 +8416,7 @@ RageEffect: ; 3f9df (f:79df) set UsingRage, [hl] ; mon is now in "rage" mode ret -MimicEffect: ; 3f9ed (f:79ed) +MimicEffect: ld c, 50 call DelayFrames call MoveHitTest @@ -8488,18 +8488,18 @@ MimicEffect: ; 3f9ed (f:79ed) .asm_3fa74 jp PrintButItFailedText_ -MimicLearnedMoveText: ; 3fa77 (f:7a77) +MimicLearnedMoveText: TX_FAR _MimicLearnedMoveText db "@" -LeechSeedEffect: ; 3fa7c (f:7a7c) +LeechSeedEffect: jpab LeechSeedEffect_ -SplashEffect: ; 3fa84 (f:7a84) +SplashEffect: call PlayCurrentMoveAnimation jp PrintNoEffectText -DisableEffect: ; 3fa8a (f:7a8a) +DisableEffect: call MoveHitTest ld a, [wMoveMissed] and a @@ -8582,74 +8582,74 @@ DisableEffect: ; 3fa8a (f:7a8a) .moveMissed jp PrintButItFailedText_ -MoveWasDisabledText: ; 3fb09 (f:7b09) +MoveWasDisabledText: TX_FAR _MoveWasDisabledText db "@" -PayDayEffect: ; 3fb0e (f:7b0e) +PayDayEffect: jpab PayDayEffect_ -ConversionEffect: ; 3fb16 (f:7b16) +ConversionEffect: jpab ConversionEffect_ -HazeEffect: ; 3fb1e (f:7b1e) +HazeEffect: jpab HazeEffect_ -HealEffect: ; 3fb26 (f:7b26) +HealEffect: jpab HealEffect_ -TransformEffect: ; 3fb2e (f:7b2e) +TransformEffect: jpab TransformEffect_ -ReflectLightScreenEffect: ; 3fb36 (f:7b36) +ReflectLightScreenEffect: jpab ReflectLightScreenEffect_ -NothingHappenedText: ; 3fb3e (f:7b3e) +NothingHappenedText: TX_FAR _NothingHappenedText db "@" -PrintNoEffectText: ; 3fb43 (f:7b43) +PrintNoEffectText: ld hl, NoEffectText jp PrintText -NoEffectText: ; 3fb49 (f:7b49) +NoEffectText: TX_FAR _NoEffectText db "@" -ConditionalPrintButItFailed: ; 3fb4e (f:7b4e) +ConditionalPrintButItFailed: ld a, [wMoveDidntMiss] and a ret nz ; return if the side effect failed, yet the attack was successful -PrintButItFailedText_: ; 3fb53 (f:7b53) +PrintButItFailedText_: ld hl, ButItFailedText jp PrintText -ButItFailedText: ; 3fb59 (f:7b59) +ButItFailedText: TX_FAR _ButItFailedText db "@" -PrintDidntAffectText: ; 3fb5e (f:7b5e) +PrintDidntAffectText: ld hl, DidntAffectText jp PrintText -DidntAffectText: ; 3fb64 (f:7b64) +DidntAffectText: TX_FAR _DidntAffectText db "@" -IsUnaffectedText: ; 3fb69 (f:7b69) +IsUnaffectedText: TX_FAR _IsUnaffectedText db "@" -PrintMayNotAttackText: ; 3fb6e (f:7b6e) +PrintMayNotAttackText: ld hl, ParalyzedMayNotAttackText jp PrintText -ParalyzedMayNotAttackText: ; 3fb74 (f:7b74) +ParalyzedMayNotAttackText: TX_FAR _ParalyzedMayNotAttackText db "@" -CheckTargetSubstitute: ; 3fb79 (f:7b79) +CheckTargetSubstitute: push hl ld hl, wEnemyBattleStatus2 ld a, [H_WHOSETURN] @@ -8661,7 +8661,7 @@ CheckTargetSubstitute: ; 3fb79 (f:7b79) pop hl ret -PlayCurrentMoveAnimation2: ; 3fb89 (f:7b89) +PlayCurrentMoveAnimation2: ; animation at MOVENUM will be played unless MOVENUM is 0 ; plays wAnimationType 3 or 6 ld a, [H_WHOSETURN] @@ -8673,7 +8673,7 @@ PlayCurrentMoveAnimation2: ; 3fb89 (f:7b89) and a ret z -PlayBattleAnimation2: ; 3fb96 (f:7b96) +PlayBattleAnimation2: ; play animation ID at a and animation type 6 or 3 ld [wAnimationID], a ld a, [H_WHOSETURN] @@ -8685,7 +8685,7 @@ PlayBattleAnimation2: ; 3fb96 (f:7b96) ld [wAnimationType], a jp PlayBattleAnimationGotID -PlayCurrentMoveAnimation: ; 3fba8 (f:7ba8) +PlayCurrentMoveAnimation: ; animation at MOVENUM will be played unless MOVENUM is 0 ; resets wAnimationType xor a @@ -8699,11 +8699,11 @@ PlayCurrentMoveAnimation: ; 3fba8 (f:7ba8) and a ret z -PlayBattleAnimation: ; 3fbb9 (f:7bb9) +PlayBattleAnimation: ; play animation ID at a and predefined animation type ld [wAnimationID], a -PlayBattleAnimationGotID: ; 3fbbc (f:7bbc) +PlayBattleAnimationGotID: ; play animation at wAnimationID push hl push de diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm index f1a0dd58..984af087 100644 --- a/engine/battle/decrement_pp.asm +++ b/engine/battle/decrement_pp.asm @@ -1,4 +1,4 @@ -DecrementPP: ; 68000 (1a:4000) +DecrementPP: ; after using a move, decrement pp in battle and (if not transformed?) in party ld a, [de] cp a, STRUGGLE diff --git a/engine/battle/display_effectiveness.asm b/engine/battle/display_effectiveness.asm index 17f0bd5b..85f2bc3e 100644 --- a/engine/battle/display_effectiveness.asm +++ b/engine/battle/display_effectiveness.asm @@ -1,4 +1,4 @@ -DisplayEffectiveness: ; 2fb7b (b:7b7b) +DisplayEffectiveness: ld a, [wDamageMultipliers] and a, $7F cp a, $0A @@ -9,10 +9,10 @@ DisplayEffectiveness: ; 2fb7b (b:7b7b) .done jp PrintText -SuperEffectiveText: ; 2fb8e (b:7b8e) +SuperEffectiveText: TX_FAR _SuperEffectiveText db "@" -NotVeryEffectiveText: ; 2fb93 (b:7b93) +NotVeryEffectiveText: TX_FAR _NotVeryEffectiveText db "@" diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index 8cfd30af..d477ffdf 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -1,4 +1,4 @@ -DrawAllPokeballs: ; 3a849 (e:6849) +DrawAllPokeballs: call LoadPartyPokeballGfx call SetupOwnPartyPokeballs ld a, [wIsInBattle] @@ -6,17 +6,17 @@ DrawAllPokeballs: ; 3a849 (e:6849) ret z ; return if wild pokémon jp SetupEnemyPartyPokeballs -DrawEnemyPokeballs: ; 3a857 (e:6857) +DrawEnemyPokeballs: call LoadPartyPokeballGfx jp SetupEnemyPartyPokeballs -LoadPartyPokeballGfx: ; 3a85d (e:685d) +LoadPartyPokeballGfx: ld de, PokeballTileGraphics ld hl, vSprites + $310 lb bc, BANK(PokeballTileGraphics), (PokeballTileGraphicsEnd - PokeballTileGraphics) / $10 jp CopyVideoData -SetupOwnPartyPokeballs: ; 3a869 (e:6869) +SetupOwnPartyPokeballs: call PlacePlayerHUDTiles ld hl, wPartyMon1 ld de, wPartyCount @@ -30,7 +30,7 @@ SetupOwnPartyPokeballs: ; 3a869 (e:6869) ld hl, wOAMBuffer jp WritePokeballOAMData -SetupEnemyPartyPokeballs: ; 3a887 (e:6887) +SetupEnemyPartyPokeballs: call PlaceEnemyHUDTiles ld hl, wEnemyMons ld de, wEnemyPartyCount @@ -66,7 +66,7 @@ SetupPokeballs: ; 0x3a8a6 jr nz, .monloop ret -PickPokeball: ; 3a8c2 (e:68c2) +PickPokeball: inc hl ld a, [hli] and a @@ -94,7 +94,7 @@ PickPokeball: ; 3a8c2 (e:68c2) add hl, bc ; next mon struct ret -WritePokeballOAMData: ; 3a8e1 (e:68e1) +WritePokeballOAMData: ld de, wBuffer ld c, PARTY_LENGTH .loop @@ -116,7 +116,7 @@ WritePokeballOAMData: ; 3a8e1 (e:68e1) jr nz, .loop ret -PlacePlayerHUDTiles: ; 3a902 (e:6902) +PlacePlayerHUDTiles: ld hl, PlayerBattleHUDGraphicsTiles ld de, wHUDGraphicsTiles ld bc, $3 @@ -125,13 +125,13 @@ PlacePlayerHUDTiles: ; 3a902 (e:6902) ld de, -1 jr PlaceHUDTiles -PlayerBattleHUDGraphicsTiles: ; 3a916 (e:6916) +PlayerBattleHUDGraphicsTiles: ; The tile numbers for specific parts of the battle display for the player's pokemon db $73 ; unused ($73 is hardcoded into the routine that uses these bytes) db $77 ; lower-right corner tile of the HUD db $6F ; lower-left triangle tile of the HUD -PlaceEnemyHUDTiles: ; 3a919 (e:6919) +PlaceEnemyHUDTiles: ld hl, EnemyBattleHUDGraphicsTiles ld de, wHUDGraphicsTiles ld bc, $3 @@ -140,13 +140,13 @@ PlaceEnemyHUDTiles: ; 3a919 (e:6919) ld de, $1 jr PlaceHUDTiles -EnemyBattleHUDGraphicsTiles: ; 3a92d (e:692d) +EnemyBattleHUDGraphicsTiles: ; The tile numbers for specific parts of the battle display for the enemy db $73 ; unused ($73 is hardcoded in the routine that uses these bytes) db $74 ; lower-left corner tile of the HUD db $78 ; lower-right triangle tile of the HUD -PlaceHUDTiles: ; 3a930 (e:6930) +PlaceHUDTiles: ld [hl], $73 ld bc, SCREEN_WIDTH add hl, bc @@ -163,7 +163,7 @@ PlaceHUDTiles: ; 3a930 (e:6930) ld [hl], a ret -SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948) +SetupPlayerAndEnemyPokeballs: call LoadPartyPokeballGfx ld hl, wPartyMons ld de, wPartyCount @@ -187,6 +187,6 @@ SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948) jp WritePokeballOAMData ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon) -PokeballTileGraphics:: ; 3a97e (e:697e) +PokeballTileGraphics:: INCBIN "gfx/pokeball.2bpp" PokeballTileGraphicsEnd: diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index 34bc3119..2d6ab2e9 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -1,4 +1,4 @@ -EndOfBattle: ; 137aa (4:77aa) +EndOfBattle: ld a, [wLinkState] cp LINK_STATE_BATTLING jr nz, .notLinkBattle @@ -74,15 +74,15 @@ EndOfBattle: ; 137aa (4:77aa) ld [wDestinationWarpID], a ret -YouWinText: ; 13853 (4:7853) +YouWinText: db "YOU WIN@" -YouLoseText: ; 1385b (4:785b) +YouLoseText: db "YOU LOSE@" -DrawText: ; 13864 (4:7864) +DrawText: db " DRAW@" -PickUpPayDayMoneyText: ; 1386b (4:786b) +PickUpPayDayMoneyText: TX_FAR _PickUpPayDayMoneyText db "@" diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 0480bfcb..c1914806 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -1,4 +1,4 @@ -GainExperience: ; 5524f (15:524f) +GainExperience: ld a, [wLinkState] cp LINK_STATE_BATTLING ret z ; return if link battle @@ -291,7 +291,7 @@ GainExperience: ; 5524f (15:524f) predef_jump FlagActionPredef ; set the fought current enemy flag for the mon that is currently out ; divide enemy base stats, catch rate, and base exp by the number of mons gaining exp -DivideExpDataByNumMonsGainingExp: ; 5546c (15:546c) +DivideExpDataByNumMonsGainingExp: ld a, [wPartyGainExpFlags] ld b, a xor a @@ -325,7 +325,7 @@ DivideExpDataByNumMonsGainingExp: ; 5546c (15:546c) ret ; multiplies exp by 1.5 -BoostExp: ; 5549f (15:549f) +BoostExp: ld a, [H_QUOTIENT + 2] ld b, a ld a, [H_QUOTIENT + 3] @@ -339,7 +339,7 @@ BoostExp: ; 5549f (15:549f) ld [H_QUOTIENT + 2], a ret -GainedText: ; 554b2 (15:54b2) +GainedText: TX_FAR _GainedText TX_ASM ld a, [wBoostExpByExpAll] @@ -353,20 +353,20 @@ GainedText: ; 554b2 (15:54b2) ld hl, BoostedText ret -WithExpAllText: ; 554cb (15:54cb) +WithExpAllText: TX_FAR _WithExpAllText TX_ASM ld hl, ExpPointsText ret -BoostedText: ; 554d4 (15:54d4) +BoostedText: TX_FAR _BoostedText -ExpPointsText: ; 554d8 (15:54d8) +ExpPointsText: TX_FAR _ExpPointsText db "@" -GrewLevelText: ; 554dd (15:54dd) +GrewLevelText: TX_FAR _GrewLevelText db $0b db "@" diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index 36492292..deed8e95 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -1,4 +1,4 @@ -GetTrainerName_: ; 13a58 (4:7a58) +GetTrainerName_: ld hl, wGrassRate ld a, [wLinkState] and a diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 6702589d..7adb20d8 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -1,4 +1,4 @@ -MarowakAnim: ; 708ca (1c:48ca) +MarowakAnim: ; animate the ghost being unveiled as a Marowak ld a, $e4 ld [rOBP1], a @@ -49,7 +49,7 @@ MarowakAnim: ; 708ca (1c:48ca) jp ClearSprites ; copies a mon pic's from background VRAM to sprite VRAM and sets up OAM -CopyMonPicFromBGToSpriteVRAM: ; 7092a (1c:492a) +CopyMonPicFromBGToSpriteVRAM: ld de, vFrontPic ld hl, vSprites ld bc, 7 * 7 diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 9372a786..bdd5d8f4 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -1,4 +1,4 @@ -InitBattleVariables: ; 525af (14:65af) +InitBattleVariables: ld a, [hTilesetType] ld [wSavedTilesetType], a xor a diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index dfb2fe35..57e7f1bb 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -1,5 +1,5 @@ ; display "[player] VS [enemy]" text box with pokeballs representing their parties next to the names -DisplayLinkBattleVersusTextBox: ; 372d6 (d:72d6) +DisplayLinkBattleVersusTextBox: call LoadTextBoxTilePatterns coord hl, 3, 4 ld b, $7 diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/moveEffects/conversion_effect.asm index 8e895361..9c347876 100644 --- a/engine/battle/moveEffects/conversion_effect.asm +++ b/engine/battle/moveEffects/conversion_effect.asm @@ -1,4 +1,4 @@ -ConversionEffect_: ; 139a3 (4:79a3) +ConversionEffect_: ld hl, wEnemyMonType1 ld de, wBattleMonType1 ld a, [H_WHOSETURN] @@ -24,12 +24,12 @@ ConversionEffect_: ; 139a3 (4:79a3) ld hl, ConvertedTypeText jp PrintText -ConvertedTypeText: ; 139cd (4:79cd) +ConvertedTypeText: TX_FAR _ConvertedTypeText db "@" -PrintButItFailedText: ; 139d2 (4:79d2) +PrintButItFailedText: ld hl, PrintButItFailedText_ -CallBankF: ; 139d5 (4:79d5) +CallBankF: ld b, BANK(PrintButItFailedText_) jp Bankswitch diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm index ffa75c13..e5f4681a 100644 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ b/engine/battle/moveEffects/drain_hp_effect.asm @@ -1,4 +1,4 @@ -DrainHPEffect_: ; 783f (1:783f) +DrainHPEffect_: ld hl, wDamage ld a, [hl] srl a ; divide damage by 2 @@ -95,10 +95,10 @@ DrainHPEffect_: ; 783f (1:783f) .printText jp PrintText -SuckedHealthText: ; 78dc (1:78dc) +SuckedHealthText: TX_FAR _SuckedHealthText db "@" -DreamWasEatenText: ; 78e1 (1:78e1) +DreamWasEatenText: TX_FAR _DreamWasEatenText db "@" diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm index b1cd03f3..9ba0ade0 100644 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ b/engine/battle/moveEffects/focus_energy_effect.asm @@ -1,4 +1,4 @@ -FocusEnergyEffect_: ; 27f86 (9:7f86) +FocusEnergyEffect_: ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a @@ -16,7 +16,7 @@ FocusEnergyEffect_: ; 27f86 (9:7f86) call DelayFrames jpab PrintButItFailedText_ -GettingPumpedText: ; 27fb3 (9:7fb3) +GettingPumpedText: db $0a TX_FAR _GettingPumpedText db "@" diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm index 8c759cce..bd20f231 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/moveEffects/haze_effect.asm @@ -1,4 +1,4 @@ -HazeEffect_: ; 139da (4:79da) +HazeEffect_: ld a, $7 ; store 7 on every stat mod ld hl, wPlayerMonAttackMod @@ -45,7 +45,7 @@ HazeEffect_: ; 139da (4:79da) ld hl, StatusChangesEliminatedText jp PrintText -CureVolatileStatuses: ; 13a37 (4:7a37) +CureVolatileStatuses: ; only cures statuses of the Pokemon not using Haze res Confused, [hl] inc hl ; BATTSTATUS2 @@ -58,7 +58,7 @@ CureVolatileStatuses: ; 13a37 (4:7a37) ld [hl], a ret -ResetStatMods: ; 13a43 (4:7a43) +ResetStatMods: ld b, $8 .loop ld [hli], a @@ -66,7 +66,7 @@ ResetStatMods: ; 13a43 (4:7a43) jr nz, .loop ret -ResetStats: ; 13a4a (4:7a4a) +ResetStats: ld b, $8 .loop ld a, [hli] @@ -76,6 +76,6 @@ ResetStats: ; 13a4a (4:7a4a) jr nz, .loop ret -StatusChangesEliminatedText: ; 13a53 (4:7a53) +StatusChangesEliminatedText: TX_FAR _StatusChangesEliminatedText db "@" diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index 4b8f83bd..b7d8283f 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -1,4 +1,4 @@ -HealEffect_: ; 3b9ec (e:79ec) +HealEffect_: ld a, [H_WHOSETURN] and a ld de, wBattleMonHP @@ -107,14 +107,14 @@ HealEffect_: ; 3b9ec (e:79ec) ld hl, PrintButItFailedText_ jp BankswitchEtoF -StartedSleepingEffect: ; 3baa2 (e:7aa2) +StartedSleepingEffect: TX_FAR _StartedSleepingEffect db "@" -FellAsleepBecameHealthyText: ; 3baa7 (e:7aa7) +FellAsleepBecameHealthyText: TX_FAR _FellAsleepBecameHealthyText db "@" -RegainedHealthText: ; 3baac (e:7aac) +RegainedHealthText: TX_FAR _RegainedHealthText db "@" diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/moveEffects/leech_seed_effect.asm index ea7ceb30..0f3a2666 100644 --- a/engine/battle/moveEffects/leech_seed_effect.asm +++ b/engine/battle/moveEffects/leech_seed_effect.asm @@ -1,4 +1,4 @@ -LeechSeedEffect_: ; 2bea9 (a:7ea9) +LeechSeedEffect_: callab MoveHitTest ld a, [wMoveMissed] and a @@ -31,10 +31,10 @@ LeechSeedEffect_: ; 2bea9 (a:7ea9) ld hl, EvadedAttackText jp PrintText -WasSeededText: ; 2bef2 (a:7ef2) +WasSeededText: TX_FAR _WasSeededText db "@" -EvadedAttackText: ; 2bef7 (a:7ef7) +EvadedAttackText: TX_FAR _EvadedAttackText db "@" diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/moveEffects/mist_effect.asm index fcdb4b28..b92777de 100644 --- a/engine/battle/moveEffects/mist_effect.asm +++ b/engine/battle/moveEffects/mist_effect.asm @@ -1,4 +1,4 @@ -MistEffect_: ; 33f2b (c:7f2b) +MistEffect_: ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a @@ -14,6 +14,6 @@ MistEffect_: ; 33f2b (c:7f2b) .mistAlreadyInUse jpab PrintButItFailedText_ -ShroudedInMistText: ; 33f52 (c:7f52) +ShroudedInMistText: TX_FAR _ShroudedInMistText db "@" diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/moveEffects/one_hit_ko_effect.asm index efba0b79..827e2197 100644 --- a/engine/battle/moveEffects/one_hit_ko_effect.asm +++ b/engine/battle/moveEffects/one_hit_ko_effect.asm @@ -1,4 +1,4 @@ -OneHitKOEffect_: ; 33f57 (c:7f57) +OneHitKOEffect_: ld hl, wDamage xor a ld [hli], a diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm index eac42a90..95979ae6 100644 --- a/engine/battle/moveEffects/paralyze_effect.asm +++ b/engine/battle/moveEffects/paralyze_effect.asm @@ -1,4 +1,4 @@ -ParalyzeEffect_: ; 52601 (14:6601) +ParalyzeEffect_: ld hl, wEnemyMonStatus ld de, wPlayerMoveType ld a, [H_WHOSETURN] diff --git a/engine/battle/moveEffects/pay_day_effect.asm b/engine/battle/moveEffects/pay_day_effect.asm index eb228615..e5daf014 100644 --- a/engine/battle/moveEffects/pay_day_effect.asm +++ b/engine/battle/moveEffects/pay_day_effect.asm @@ -1,4 +1,4 @@ -PayDayEffect_: ; 2feb8 (b:7eb8) +PayDayEffect_: xor a ld hl, wcd6d ld [hli], a @@ -40,6 +40,6 @@ PayDayEffect_: ; 2feb8 (b:7eb8) ld hl, CoinsScatteredText jp PrintText -CoinsScatteredText: ; 2ff04 (b:7f04) +CoinsScatteredText: TX_FAR _CoinsScatteredText db "@" diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 43bf8d5f..7fc90c44 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -1,4 +1,4 @@ -RecoilEffect_: ; 1392c (4:792c) +RecoilEffect_: ld a, [H_WHOSETURN] and a ld a, [wPlayerMoveNum] @@ -65,6 +65,6 @@ RecoilEffect_: ; 1392c (4:792c) predef UpdateHPBar2 ld hl, HitWithRecoilText jp PrintText -HitWithRecoilText: ; 1399e (4:799e) +HitWithRecoilText: TX_FAR _HitWithRecoilText db "@" diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index 45f785a4..b45fbe20 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -1,4 +1,4 @@ -ReflectLightScreenEffect_: ; 3bb97 (e:7b97) +ReflectLightScreenEffect_: ld hl, wPlayerBattleStatus3 ld de, wPlayerMoveEffect ld a, [H_WHOSETURN] @@ -32,14 +32,14 @@ ReflectLightScreenEffect_: ; 3bb97 (e:7b97) ld hl, PrintButItFailedText_ jp BankswitchEtoF -LightScreenProtectedText: ; 3bbd7 (e:7bd7) +LightScreenProtectedText: TX_FAR _LightScreenProtectedText db "@" -ReflectGainedArmorText: ; 3bbdc (e:7bdc) +ReflectGainedArmorText: TX_FAR _ReflectGainedArmorText db "@" -BankswitchEtoF: ; 3bbe1 (e:7be1) +BankswitchEtoF: ld b, BANK(BattleCore) jp Bankswitch diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index 7cac9f62..03314ebf 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -1,4 +1,4 @@ -SubstituteEffect_: ; 17dad (5:7dad) +SubstituteEffect_: ld c, 50 call DelayFrames ld hl, wBattleMonMaxHP @@ -64,14 +64,14 @@ SubstituteEffect_: ; 17dad (5:7dad) .printText jp PrintText -SubstituteText: ; 17e1d (5:7e1d) +SubstituteText: TX_FAR _SubstituteText db "@" -HasSubstituteText: ; 17e22 (5:7e22) +HasSubstituteText: TX_FAR _HasSubstituteText db "@" -TooWeakSubstituteText: ; 17e27 (5:7e27) +TooWeakSubstituteText: TX_FAR _TooWeakSubstituteText db "@" diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm index 097a0d3a..45f8c910 100644 --- a/engine/battle/moveEffects/transform_effect.asm +++ b/engine/battle/moveEffects/transform_effect.asm @@ -1,4 +1,4 @@ -TransformEffect_: ; 3bab1 (e:7ab1) +TransformEffect_: ld hl, wBattleMonSpecies ld de, wEnemyMonSpecies ld bc, wEnemyBattleStatus3 @@ -143,6 +143,6 @@ TransformEffect_: ; 3bab1 (e:7ab1) ld hl, PrintButItFailedText_ jp BankswitchEtoF -TransformedText: ; 3bb92 (e:7b92) +TransformedText: TX_FAR _TransformedText db "@" diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm index deca2426..f717f871 100644 --- a/engine/battle/print_type.asm +++ b/engine/battle/print_type.asm @@ -1,6 +1,6 @@ ; [wd0b5] = pokemon ID ; hl = dest addr -PrintMonType: ; 27d6b (9:7d6b) +PrintMonType: call GetPredefRegisters push hl call GetMonHeader @@ -19,25 +19,25 @@ PrintMonType: ; 27d6b (9:7d6b) ; a = type ; hl = dest addr -PrintType: ; 27d89 (9:7d89) +PrintType: push hl jr PrintType_ ; erase "TYPE2/" if the mon only has 1 type -EraseType2Text: ; 27d8c (9:7d8c) +EraseType2Text: ld a, " " ld bc, $13 add hl, bc ld bc, $6 jp FillMemory -PrintMoveType: ; 27d98 (9:7d98) +PrintMoveType: call GetPredefRegisters push hl ld a, [wPlayerMoveType] ; fall through -PrintType_: ; 27d9f (9:7d9f) +PrintType_: add a ld hl, TypeNames ld e, a diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 4a5657b2..3672d8dc 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -1,4 +1,4 @@ -ReadTrainer: ; 39c53 (e:5c53) +ReadTrainer: ; don't change any moves in a link battle ld a,[wLinkState] diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index 344e2309..1eb1a615 100755 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -1,4 +1,4 @@ -PrintSafariZoneBattleText: ; 4277 (1:4277) +PrintSafariZoneBattleText: ld hl, wSafariBaitFactor ld a, [hl] and a @@ -27,10 +27,10 @@ PrintSafariZoneBattleText: ; 4277 (1:4277) pop hl jp PrintText -SafariZoneEatingText: ; 42a7 (1:42a7) +SafariZoneEatingText: TX_FAR _SafariZoneEatingText db "@" -SafariZoneAngryText: ; 42ac (1:42ac) +SafariZoneAngryText: TX_FAR _SafariZoneAngryText db "@" diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm index ceba63bd..7e2c911c 100644 --- a/engine/battle/save_trainer_name.asm +++ b/engine/battle/save_trainer_name.asm @@ -1,4 +1,4 @@ -SaveTrainerName: ; 27e4a (9:7e4a) +SaveTrainerName: ld hl,TrainerNamePointers ld a,[wTrainerClass] dec a @@ -18,7 +18,7 @@ SaveTrainerName: ; 27e4a (9:7e4a) jr nz,.CopyCharacter ret -TrainerNamePointers: ; 27e64 (9:7e64) +TrainerNamePointers: ; what is the point of these? dw YoungsterName dw BugCatcherName @@ -68,45 +68,45 @@ TrainerNamePointers: ; 27e64 (9:7e64) dw wTrainerName dw wTrainerName -YoungsterName: ; 27ec2 (9:7ec2) +YoungsterName: db "YOUNGSTER@" -BugCatcherName: ; 27ecc (9:7ecc) +BugCatcherName: db "BUG CATCHER@" -LassName: ; 27ed8 (9:7ed8) +LassName: db "LASS@" -JrTrainerMName: ; 27edd (9:7edd) +JrTrainerMName: db "JR.TRAINER♂@" -JrTrainerFName: ; 27ee9 (9:7ee9) +JrTrainerFName: db "JR.TRAINER♀@" -PokemaniacName: ; 27ef5 (9:7ef5) +PokemaniacName: db "POKéMANIAC@" -SuperNerdName: ; 27f00 (9:7f00) +SuperNerdName: db "SUPER NERD@" -BurglarName: ; 27f0b (9:7f0b) +BurglarName: db "BURGLAR@" -EngineerName: ; 27f13 (9:7f13) +EngineerName: db "ENGINEER@" -JugglerXName: ; 27f1c (9:7f1c) +JugglerXName: db "JUGGLER@" -SwimmerName: ; 27f24 (9:7f24) +SwimmerName: db "SWIMMER@" -BeautyName: ; 27f2c (9:7f2c) +BeautyName: db "BEAUTY@" -RockerName: ; 27f33 (9:7f33) +RockerName: db "ROCKER@" -JugglerName: ; 27f3a (9:7f3a) +JugglerName: db "JUGGLER@" -BlackbeltName: ; 27f42 (9:7f42) +BlackbeltName: db "BLACKBELT@" -ProfOakName: ; 27f4c (9:7f4c) +ProfOakName: db "PROF.OAK@" -ChiefName: ; 27f55 (9:7f55) +ChiefName: db "CHIEF@" -ScientistName: ; 27f5b (9:7f5b) +ScientistName: db "SCIENTIST@" -RocketName: ; 27f65 (9:7f65) +RocketName: db "ROCKET@" -CooltrainerMName: ; 27f6c (9:7f6c) +CooltrainerMName: db "COOLTRAINER♂@" -CooltrainerFName: ; 27f79 (9:7f79) +CooltrainerFName: db "COOLTRAINER♀@" diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm index 6a8d43a9..98521528 100644 --- a/engine/battle/scale_sprites.asm +++ b/engine/battle/scale_sprites.asm @@ -1,7 +1,7 @@ ; scales both uncompressed sprite chunks by two in every dimension (creating 2x2 output pixels per input pixel) ; assumes that input sprite chunks are 4x4 tiles, and the rightmost and bottommost 4 pixels will be ignored ; resulting in a 7*7 tile output sprite chunk -ScaleSpriteByTwo: ; 2fe40 (b:7e40) +ScaleSpriteByTwo: ld de, sSpriteBuffer1 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped ld hl, sSpriteBuffer0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer call ScaleLastSpriteColumnByTwo ; last tile column is special case @@ -10,7 +10,7 @@ ScaleSpriteByTwo: ; 2fe40 (b:7e40) ld hl, sSpriteBuffer1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer call ScaleLastSpriteColumnByTwo ; last tile column is special case -ScaleFirstThreeSpriteColumnsByTwo: ; 2fe55 (b:7e55) +ScaleFirstThreeSpriteColumnsByTwo: ld b, $3 ; 3 tile columns .columnLoop ld c, 4*8 - 4 ; $1c, 4 tiles minus 4 unused rows @@ -39,7 +39,7 @@ ScaleFirstThreeSpriteColumnsByTwo: ; 2fe55 (b:7e55) jr nz, .columnLoop ret -ScaleLastSpriteColumnByTwo: ; 2fe7d (b:7e7d) +ScaleLastSpriteColumnByTwo: ld a, 4*8 - 4 ; $1c, 4 tiles minus 4 unused rows ld [H_SPRITEINTERLACECOUNTER], a ld bc, -1 @@ -61,7 +61,7 @@ ScaleLastSpriteColumnByTwo: ; 2fe7d (b:7e7d) ; scales the given 4 bits in a (4x1 pixels) to 2 output bytes (8x2 pixels) ; hl: destination pointer ; bc: destination pointer offset (added after the two bytes have been written) -ScalePixelsByTwo: ; 2fe97 (b:7e97) +ScalePixelsByTwo: push hl and $f ld hl, DuplicateBitsTable @@ -78,7 +78,7 @@ ScalePixelsByTwo: ; 2fe97 (b:7e97) ret ; repeats each input bit twice -DuplicateBitsTable: ; 2fea8 (b:7ea8) +DuplicateBitsTable: db $00, $03, $0c, $0f db $30, $33, $3c, $3f db $c0, $c3, $cc, $cf diff --git a/engine/battle/scroll_draw_trainer_pic.asm b/engine/battle/scroll_draw_trainer_pic.asm index 5949208c..98893dcf 100644 --- a/engine/battle/scroll_draw_trainer_pic.asm +++ b/engine/battle/scroll_draw_trainer_pic.asm @@ -1,4 +1,4 @@ -_ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3) +_ScrollTrainerPicAfterBattle: ; Load the enemy trainer's pic and scrolls it into ; the screen from the right. xor a @@ -32,7 +32,7 @@ _ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3) jr .scrollLoop ; write one 7-tile column of the trainer pic to the tilemap -DrawTrainerPicColumn: ; 39707 (e:5707) +DrawTrainerPicColumn: push hl push de push bc diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index bab4c253..385cdd1b 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -1,6 +1,6 @@ ; creates a set of moves that may be used and returns its address in hl ; unused slots are filled with 0, all used slots may be chosen with equal probability -AIEnemyTrainerChooseMoves: ; 39719 (e:5719) +AIEnemyTrainerChooseMoves: ld a, $a ld hl, wBuffer ; init temporary move selection array. Only the moves with the lowest numbers are chosen in the end ld [hli], a ; move 1 @@ -103,14 +103,14 @@ AIEnemyTrainerChooseMoves: ; 39719 (e:5719) ld hl, wEnemyMonMoves ; use original move set ret -AIMoveChoiceModificationFunctionPointers: ; 397a3 (e:57a3) +AIMoveChoiceModificationFunctionPointers: dw AIMoveChoiceModification1 dw AIMoveChoiceModification2 dw AIMoveChoiceModification3 dw AIMoveChoiceModification4 ; unused, does nothing ; discourages moves that cause no damage but only a status ailment if player's mon already has one -AIMoveChoiceModification1: ; 397ab (e:57ab) +AIMoveChoiceModification1: ld a, [wBattleMonStatus] and a ret z ; return if no status ailment on player's mon @@ -155,7 +155,7 @@ StatusAilmentMoveEffects: ; 57e2 ; slightly encourage moves with specific effects. ; in particular, stat-modifying moves and other move effects ; that fall in-bewteen -AIMoveChoiceModification2: ; 397e7 (e:57e7) +AIMoveChoiceModification2: ld a, [wAILayer2Encouragement] cp $1 ret nz @@ -188,7 +188,7 @@ AIMoveChoiceModification2: ; 397e7 (e:57e7) ; encourages moves that are effective against the player's mon (even if non-damaging). ; discourage damaging moves that are ineffective or not very effective against the player's mon, ; unless there's no damaging move that deals at least neutral damage -AIMoveChoiceModification3: ; 39817 (e:5817) +AIMoveChoiceModification3: ld hl, wBuffer - 1 ; temp move selection array (-1 byte offset) ld de, wEnemyMonMoves ; enemy moves ld b, NUM_MOVES + 1 @@ -255,10 +255,10 @@ AIMoveChoiceModification3: ; 39817 (e:5817) jr z, .nextMove inc [hl] ; sligthly discourage this move jr .nextMove -AIMoveChoiceModification4: ; 39883 (e:5883) +AIMoveChoiceModification4: ret -ReadMove: ; 39884 (e:5884) +ReadMove: push hl push de push bc @@ -275,7 +275,7 @@ ReadMove: ; 39884 (e:5884) ; move choice modification methods that are applied for each trainer class ; 0 is sentinel value -TrainerClassMoveChoiceModifications: ; 3989b (e:589b) +TrainerClassMoveChoiceModifications: db 0 ; YOUNGSTER db 1,0 ; BUG CATCHER db 1,0 ; LASS @@ -336,7 +336,7 @@ INCLUDE "data/trainer_moves.asm" INCLUDE "data/trainer_parties.asm" -TrainerAI: ; 3a52e (e:652e) +TrainerAI: and a ld a,[wIsInBattle] dec a @@ -368,7 +368,7 @@ TrainerAI: ; 3a52e (e:652e) call Random jp [hl] -TrainerAIPointers: ; 3a55c (e:655c) +TrainerAIPointers: ; one entry per trainer class ; first byte, number of times (per Pokémon) it can occur ; next two bytes, pointer to AI subroutine for trainer class @@ -420,27 +420,27 @@ TrainerAIPointers: ; 3a55c (e:655c) dbw 2,AgathaAI ; agatha dbw 1,LanceAI ; lance -JugglerAI: ; 3a5e9 (e:65e9) +JugglerAI: cp $40 ret nc jp AISwitchIfEnoughMons -BlackbeltAI: ; 3a5ef (e:65ef) +BlackbeltAI: cp $20 ret nc jp AIUseXAttack -GiovanniAI: ; 3a5f5 (e:65f5) +GiovanniAI: cp $40 ret nc jp AIUseGuardSpec -CooltrainerMAI: ; 3a5fb (e:65fb) +CooltrainerMAI: cp $40 ret nc jp AIUseXAttack -CooltrainerFAI: ; 3a601 (e:6601) +CooltrainerFAI: cp $40 ld a,$A call AICheckIfHPBelowFraction @@ -450,24 +450,24 @@ CooltrainerFAI: ; 3a601 (e:6601) ret nc jp AISwitchIfEnoughMons -BrockAI: ; 3a614 (e:6614) +BrockAI: ; if his active monster has a status condition, use a full heal ld a,[wEnemyMonStatus] and a ret z jp AIUseFullHeal -MistyAI: ; 3a61c (e:661c) +MistyAI: cp $40 ret nc jp AIUseXDefend -LtSurgeAI: ; 3a622 (e:6622) +LtSurgeAI: cp $40 ret nc jp AIUseXSpeed -ErikaAI: ; 3a628 (e:6628) +ErikaAI: cp $80 ret nc ld a,$A @@ -475,17 +475,17 @@ ErikaAI: ; 3a628 (e:6628) ret nc jp AIUseSuperPotion -KogaAI: ; 3a634 (e:6634) +KogaAI: cp $40 ret nc jp AIUseXAttack -BlaineAI: ; 3a63a (e:663a) +BlaineAI: cp $40 ret nc jp AIUseSuperPotion -SabrinaAI: ; 3a640 (e:6640) +SabrinaAI: cp $40 ret nc ld a,$A @@ -493,7 +493,7 @@ SabrinaAI: ; 3a640 (e:6640) ret nc jp AIUseHyperPotion -Sony2AI: ; 3a64c (e:664c) +Sony2AI: cp $20 ret nc ld a,5 @@ -501,7 +501,7 @@ Sony2AI: ; 3a64c (e:664c) ret nc jp AIUsePotion -Sony3AI: ; 3a658 (e:6658) +Sony3AI: cp $20 ret nc ld a,5 @@ -509,7 +509,7 @@ Sony3AI: ; 3a658 (e:6658) ret nc jp AIUseFullRestore -LoreleiAI: ; 3a664 (e:6664) +LoreleiAI: cp $80 ret nc ld a,5 @@ -517,12 +517,12 @@ LoreleiAI: ; 3a664 (e:6664) ret nc jp AIUseSuperPotion -BrunoAI: ; 3a670 (e:6670) +BrunoAI: cp $40 ret nc jp AIUseXDefend -AgathaAI: ; 3a676 (e:6676) +AgathaAI: cp $14 jp c,AISwitchIfEnoughMons cp $80 @@ -532,7 +532,7 @@ AgathaAI: ; 3a676 (e:6676) ret nc jp AIUseSuperPotion -LanceAI: ; 3a687 (e:6687) +LanceAI: cp $80 ret nc ld a,5 @@ -540,23 +540,23 @@ LanceAI: ; 3a687 (e:6687) ret nc jp AIUseHyperPotion -GenericAI: ; 3a693 (e:6693) +GenericAI: and a ; clear carry ret ; end of individual trainer AI routines -DecrementAICount: ; 3a695 (e:6695) +DecrementAICount: ld hl,wAICount dec [hl] scf ret -AIPlayRestoringSFX: ; 3a69b (e:669b) +AIPlayRestoringSFX: ld a,SFX_HEAL_AILMENT jp PlaySoundWaitForCurrent -AIUseFullRestore: ; 3a6a0 (e:66a0) +AIUseFullRestore: call AICureStatus ld a,FULL_RESTORE ld [wAIItem],a @@ -580,25 +580,25 @@ AIUseFullRestore: ; 3a6a0 (e:66a0) ld [wEnemyMonHP],a jr AIPrintItemUseAndUpdateHPBar -AIUsePotion: ; 3a6ca (e:66ca) +AIUsePotion: ; enemy trainer heals his monster with a potion ld a,POTION ld b,20 jr AIRecoverHP -AIUseSuperPotion: ; 3a6d0 (e:66d0) +AIUseSuperPotion: ; enemy trainer heals his monster with a super potion ld a,SUPER_POTION ld b,50 jr AIRecoverHP -AIUseHyperPotion: ; 3a6d6 (e:66d6) +AIUseHyperPotion: ; enemy trainer heals his monster with a hyper potion ld a,HYPER_POTION ld b,200 ; fallthrough -AIRecoverHP: ; 3a6da (e:66da) +AIRecoverHP: ; heal b HP and print "trainer used $(a) on pokemon!" ld [wAIItem],a ld hl,wEnemyMonHP + 1 @@ -639,7 +639,7 @@ AIRecoverHP: ; 3a6da (e:66da) ld [wHPBarNewHP+1],a ; fallthrough -AIPrintItemUseAndUpdateHPBar: ; 3a718 (e:6718) +AIPrintItemUseAndUpdateHPBar: call AIPrintItemUse_ coord hl, 2, 2 xor a @@ -647,7 +647,7 @@ AIPrintItemUseAndUpdateHPBar: ; 3a718 (e:6718) predef UpdateHPBar2 jp DecrementAICount -AISwitchIfEnoughMons: ; 3a72a (e:672a) +AISwitchIfEnoughMons: ; enemy trainer switches if there are 3 or more unfainted mons in party ld a,[wEnemyPartyCount] ld c,a @@ -677,7 +677,7 @@ AISwitchIfEnoughMons: ; 3a72a (e:672a) and a ret -SwitchEnemyMon: ; 3a74b (e:674b) +SwitchEnemyMon: ; prepare to withdraw the active monster: copy hp, number, and status to roster @@ -708,17 +708,17 @@ SwitchEnemyMon: ; 3a74b (e:674b) scf ret -AIBattleWithdrawText: ; 3a781 (e:6781) +AIBattleWithdrawText: TX_FAR _AIBattleWithdrawText db "@" -AIUseFullHeal: ; 3a786 (e:6786) +AIUseFullHeal: call AIPlayRestoringSFX call AICureStatus ld a,FULL_HEAL jp AIPrintItemUse -AICureStatus: ; 3a791 (e:6791) +AICureStatus: ; cures the status of enemy's active pokemon ld a,[wEnemyMonPartyPos] ld hl,wEnemyMon1Status @@ -738,7 +738,7 @@ AIUseXAccuracy: ; 0x3a7a8 unused ld a,X_ACCURACY jp AIPrintItemUse -AIUseGuardSpec: ; 3a7b5 (e:67b5) +AIUseGuardSpec: call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 1,[hl] @@ -752,7 +752,7 @@ AIUseDireHit: ; 0x3a7c2 unused ld a,DIRE_HIT jp AIPrintItemUse -AICheckIfHPBelowFraction: ; 3a7cf (e:67cf) +AICheckIfHPBelowFraction: ; return carry if enemy trainer's current HP is below 1 / a of the maximum ld [H_DIVISOR],a ld hl,wEnemyMonMaxHP @@ -778,27 +778,27 @@ AICheckIfHPBelowFraction: ; 3a7cf (e:67cf) sub c ret -AIUseXAttack: ; 3a7f2 (e:67f2) +AIUseXAttack: ld b,$A ld a,X_ATTACK jr AIIncreaseStat -AIUseXDefend: ; 3a7f8 (e:67f8) +AIUseXDefend: ld b,$B ld a,X_DEFEND jr AIIncreaseStat -AIUseXSpeed: ; 3a7fe (e:67fe) +AIUseXSpeed: ld b,$C ld a,X_SPEED jr AIIncreaseStat -AIUseXSpecial: ; 3a804 (e:6804) +AIUseXSpecial: ld b,$D ld a,X_SPECIAL ; fallthrough -AIIncreaseStat: ; 3a808 (e:6808) +AIIncreaseStat: ld [wAIItem],a push bc call AIPrintItemUse_ @@ -820,12 +820,12 @@ AIIncreaseStat: ; 3a808 (e:6808) ld [hl],a jp DecrementAICount -AIPrintItemUse: ; 3a82c (e:682c) +AIPrintItemUse: ld [wAIItem],a call AIPrintItemUse_ jp DecrementAICount -AIPrintItemUse_: ; 3a835 (e:6835) +AIPrintItemUse_: ; print "x used [wAIItem] on z!" ld a,[wAIItem] ld [wd11e],a @@ -833,6 +833,6 @@ AIPrintItemUse_: ; 3a835 (e:6835) ld hl, AIBattleUseItemText jp PrintText -AIBattleUseItemText: ; 3a844 (e:6844) +AIBattleUseItemText: TX_FAR _AIBattleUseItemText db "@" diff --git a/engine/battle/trainer_pic_money_pointers.asm b/engine/battle/trainer_pic_money_pointers.asm index 3f684db3..37678e74 100755 --- a/engine/battle/trainer_pic_money_pointers.asm +++ b/engine/battle/trainer_pic_money_pointers.asm @@ -1,4 +1,4 @@ -TrainerPicAndMoneyPointers: ; 39914 (e:5914) +TrainerPicAndMoneyPointers: ; trainer pic pointers and base money. ; money received after battle = base money × level of highest-level enemy mon dw YoungsterPic diff --git a/engine/battle/unused_stats_functions.asm b/engine/battle/unused_stats_functions.asm index 23ddbc20..55f78fd3 100644 --- a/engine/battle/unused_stats_functions.asm +++ b/engine/battle/unused_stats_functions.asm @@ -1,5 +1,5 @@ ; does nothing since no stats are ever selected (barring glitches) -DoubleSelectedStats: ; 39680 (e:5680) +DoubleSelectedStats: ld a, [H_WHOSETURN] and a ld a, [wPlayerStatsToDouble] @@ -29,7 +29,7 @@ DoubleSelectedStats: ; 39680 (e:5680) ret ; does nothing since no stats are ever selected (barring glitches) -HalveSelectedStats: ; 396a7 (e:56a7) +HalveSelectedStats: ld a, [H_WHOSETURN] and a ld a, [wPlayerStatsToHalve] diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 044f7ea5..231c46e7 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -1,6 +1,6 @@ ; try to initiate a wild pokemon encounter ; returns success in Z -TryDoWildEncounter: ; 13870 (4:7870) +TryDoWildEncounter: ld a, [wNPCMovementScriptPointerTableNum] and a ret nz @@ -101,7 +101,7 @@ TryDoWildEncounter: ; 13870 (4:7870) xor a ret -WildMonEncounterSlotChances: ; 13918 (4:7918) +WildMonEncounterSlotChances: ; There are 10 slots for wild pokemon, and this is the table that defines how common each of ; those 10 slots is. A random number is generated and then the first byte of each pair in this ; table is compared against that random number. If the random number is less than or equal diff --git a/engine/cable_club.asm b/engine/cable_club.asm index f2f881d8..d9893f1f 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -1,7 +1,7 @@ ; performs the appropriate action when the player uses the gameboy on the table in the Colosseum or Trade Center ; In the Colosseum, it starts a battle. In the Trade Center, it displays the trade selection screen. ; Before doing either action, it swaps random numbers, trainer names and party data with the other gameboy. -CableClub_DoBattleOrTrade: ; 5317 (1:5317) +CableClub_DoBattleOrTrade: ld c, 80 call DelayFrames call ClearScreen @@ -289,7 +289,7 @@ CableClub_DoBattleOrTradeAgain: ; 5345 call PlayMusic jr CallCurrentTradeCenterFunction -PleaseWaitString: ; 550f (1:550f) +PleaseWaitString: db "PLEASE WAIT!@" CallCurrentTradeCenterFunction: @@ -576,7 +576,7 @@ TradeCenter_SelectMon: jr nz, .cancelMenuItem_Loop ; fall through -ReturnToCableClubRoom: ; 577d (1:577d) +ReturnToCableClubRoom: call GBPalWhiteOutWithDelay3 ld hl, wFontLoaded ld a, [hl] @@ -871,7 +871,7 @@ TradeCenter_Trade: ld [wTradeCenterPointerTableIndex], a jp CallCurrentTradeCenterFunction -WillBeTradedText: ; 5a24 (1:5a24) +WillBeTradedText: TX_FAR _WillBeTradedText db "@" @@ -882,11 +882,11 @@ TradeCanceled: db "Too bad! The trade" next "was canceled!@" -TradeCenterPointerTable: ; 5a5b (1:5a5b) +TradeCenterPointerTable: dw TradeCenter_SelectMon dw TradeCenter_Trade -CableClub_Run: ; 5a5f (1:5a5f) +CableClub_Run: ld a, [wLinkState] cp LINK_STATE_START_TRADE jr z, .doBattleOrTrade @@ -923,15 +923,15 @@ CableClub_Run: ; 5a5f (1:5a5f) ld [wNewSoundID], a jp PlaySound -EmptyFunc3: ; 5aaf (1:5aaf) +EmptyFunc3: ret -Diploma_TextBoxBorder: ; 5ab0 (1:5ab0) +Diploma_TextBoxBorder: call GetPredefRegisters ; b = height ; c = width -CableClub_TextBoxBorder: ; 5ab3 (1:5ab3) +CableClub_TextBoxBorder: push hl ld a, $78 ; border upper left corner tile ld [hli], a @@ -962,7 +962,7 @@ CableClub_TextBoxBorder: ; 5ab3 (1:5ab3) ret ; c = width -CableClub_DrawHorizontalLine: ; 5ae0 (1:5ae0) +CableClub_DrawHorizontalLine: ld d, c .asm_5ae1 ld [hli], a diff --git a/engine/clear_save.asm b/engine/clear_save.asm index adbef1a4..b47cd6c4 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -1,4 +1,4 @@ -DoClearSaveDialogue: ; 1c98a (7:498a) +DoClearSaveDialogue: call ClearScreen call RunDefaultPaletteCommand call LoadFontTilePatterns @@ -18,6 +18,6 @@ DoClearSaveDialogue: ; 1c98a (7:498a) callba ClearSAV jp Init -ClearSaveDataText: ; 1c9c1 (7:49c1) +ClearSaveDataText: TX_FAR _ClearSaveDataText db "@" diff --git a/engine/evolution.asm b/engine/evolution.asm index c65cc293..c0a3434a 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -1,4 +1,4 @@ -EvolveMon: ; 7bde9 (1e:7de9) +EvolveMon: push hl push de push bc @@ -93,16 +93,16 @@ EvolveMon: ; 7bde9 (1e:7de9) ld a, [wEvoOldSpecies] jr .done -EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4) +EvolutionSetWholeScreenPalette: ld b, SET_PAL_POKEMON_WHOLE_SCREEN jp RunPaletteCommand -Evolution_LoadPic: ; 7beb9 (1e:7eb9) +Evolution_LoadPic: call GetMonHeader coord hl, 7, 2 jp LoadFlippedFrontSpriteByMonIndex -Evolution_BackAndForthAnim: ; 7bec2 (1e:7ec2) +Evolution_BackAndForthAnim: ; show the mon change back and forth between the new and old species b times ld a, $31 ld [wEvoMonTileOffset], a @@ -114,7 +114,7 @@ Evolution_BackAndForthAnim: ; 7bec2 (1e:7ec2) jr nz, Evolution_BackAndForthAnim ret -Evolution_ChangeMonPic: ; 7bed6 (1e:7ed6) +Evolution_ChangeMonPic: push bc xor a ld [H_AUTOBGTRANSFERENABLED], a @@ -139,7 +139,7 @@ Evolution_ChangeMonPic: ; 7bed6 (1e:7ed6) pop bc ret -Evolution_CheckForCancel: ; 7befa (1e:7efa) +Evolution_CheckForCancel: call DelayFrame push bc call JoypadLowSensitivity diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm index 81e41166..e17fc05c 100755 --- a/engine/evolve_trade.asm +++ b/engine/evolve_trade.asm @@ -1,4 +1,4 @@ -EvolveTradeMon: ; 17d7d (5:7d7d) +EvolveTradeMon: ; Verify the TradeMon's species name before ; attempting to initiate a trade evolution. diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 2113e50a..f50f8081 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -1,5 +1,5 @@ ; try to evolve the mon in [wWhichPokemon] -TryEvolvingMon: ; 3ad0e (e:6d0e) +TryEvolvingMon: ld hl, wCanEvolveFlags xor a ld [hl], a @@ -10,7 +10,7 @@ TryEvolvingMon: ; 3ad0e (e:6d0e) ; this is only called after battle ; it is supposed to do level up evolutions, though there is a bug that allows item evolutions to occur -EvolutionAfterBattle: ; 3ad1c (e:6d1c) +EvolutionAfterBattle: ld a, [hTilesetType] push af xor a @@ -257,7 +257,7 @@ Evolution_PartyMonLoop: ; loop over party mons call nz, PlayDefaultMusic ret -RenameEvolvedMon: ; 3aef7 (e:6ef7) +RenameEvolvedMon: ; Renames the mon to its new, evolved form's standard name unless it had a ; nickname, in which case the nickname is kept. ld a, [wd0b5] @@ -287,7 +287,7 @@ RenameEvolvedMon: ; 3aef7 (e:6ef7) pop de jp CopyData -CancelledEvolution: ; 3af2e (e:6f2e) +CancelledEvolution: ld hl, StoppedEvolvingText call PrintText call ClearScreen @@ -295,29 +295,29 @@ CancelledEvolution: ; 3af2e (e:6f2e) call Evolution_ReloadTilesetTilePatterns jp Evolution_PartyMonLoop -EvolvedText: ; 3af3e (e:6f3e) +EvolvedText: TX_FAR _EvolvedText db "@" -IntoText: ; 3af43 (e:6f43) +IntoText: TX_FAR _IntoText db "@" -StoppedEvolvingText: ; 3af48 (e:6f48) +StoppedEvolvingText: TX_FAR _StoppedEvolvingText db "@" -IsEvolvingText: ; 3af4d (e:6f4d) +IsEvolvingText: TX_FAR _IsEvolvingText db "@" -Evolution_ReloadTilesetTilePatterns: ; 3af52 (e:6f52) +Evolution_ReloadTilesetTilePatterns: ld a, [wLinkState] cp LINK_STATE_TRADING ret z jp ReloadTilesetTilePatterns -LearnMoveFromLevelUp: ; 3af5b (e:6f5b) +LearnMoveFromLevelUp: ld hl, EvosMovesPointerTable ld a, [wd11e] ; species ld [wcf91], a @@ -377,7 +377,7 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b) ; writes the moves a mon has at level [wCurEnemyLVL] to [de] ; move slots are being filled up sequentially and shifted if all slots are full -WriteMonMoves: ; 3afb8 (e:6fb8) +WriteMonMoves: call GetPredefRegisters push hl push de @@ -497,7 +497,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8) ret ; shifts all move data one up (freeing 4th move slot) -WriteMonMoves_ShiftMoveData: ; 3b04e (e:704e) +WriteMonMoves_ShiftMoveData: ld c, NUM_MOVES - 1 .loop inc de @@ -507,7 +507,7 @@ WriteMonMoves_ShiftMoveData: ; 3b04e (e:704e) jr nz, .loop ret -Evolution_FlagAction: ; 3b057 (e:7057) +Evolution_FlagAction: predef_jump FlagActionPredef INCLUDE "data/evos_moves.asm" diff --git a/engine/experience.asm b/engine/experience.asm index e1037950..2efc13de 100755 --- a/engine/experience.asm +++ b/engine/experience.asm @@ -1,5 +1,5 @@ ; calculates the level a mon should be based on its current exp -CalcLevelFromExperience: ; 58f43 (16:4f43) +CalcLevelFromExperience: ld a, [wLoadedMonSpecies] ld [wd0b5], a call GetMonHeader @@ -28,7 +28,7 @@ CalcLevelFromExperience: ; 58f43 (16:4f43) ret ; calculates the amount of experience needed for level d -CalcExperience: ; 58f6a (16:4f6a) +CalcExperience: ld a, [wMonHGrowthRate] add a add a @@ -137,7 +137,7 @@ CalcExperience: ; 58f6a (16:4f6a) ret ; calculates d*d -CalcDSquared: ; 59010 (16:5010) +CalcDSquared: xor a ld [H_MULTIPLICAND], a ld [H_MULTIPLICAND + 1], a @@ -151,7 +151,7 @@ CalcDSquared: ; 59010 (16:5010) ; resulting in ; (a*n^3)/b + sign*c*n^2 + d*n - e ; where sign = -1 <=> S=1 -GrowthRateTable: ; 5901d (16:501d) +GrowthRateTable: db $11,$00,$00,$00 ; medium fast n^3 db $34,$0A,$00,$1E ; (unused?) 3/4 n^3 + 10 n^2 - 30 db $34,$14,$00,$46 ; (unused?) 3/4 n^3 + 20 n^2 - 70 diff --git a/engine/game_corner_slots.asm b/engine/game_corner_slots.asm index ff17d4d3..3c5b3a10 100755 --- a/engine/game_corner_slots.asm +++ b/engine/game_corner_slots.asm @@ -1,4 +1,4 @@ -StartSlotMachine: ; 37e2d (d:7e2d) +StartSlotMachine: ld a, [wHiddenObjectFunctionArgument] cp $fd jr z, .printOutOfOrder @@ -41,14 +41,14 @@ StartSlotMachine: ; 37e2d (d:7e2d) call PrintPredefTextID ret -GameCornerOutOfOrderText: ; 37e79 (d:7e79) +GameCornerOutOfOrderText: TX_FAR _GameCornerOutOfOrderText db "@" -GameCornerOutToLunchText: ; 37e7e (d:7e7e) +GameCornerOutToLunchText: TX_FAR _GameCornerOutToLunchText db "@" -GameCornerSomeonesKeysText: ; 37e83 (d:7e83) +GameCornerSomeonesKeysText: TX_FAR _GameCornerSomeonesKeysText db "@" diff --git a/engine/game_corner_slots2.asm b/engine/game_corner_slots2.asm index 58386ba1..6bbaf72d 100755 --- a/engine/game_corner_slots2.asm +++ b/engine/game_corner_slots2.asm @@ -1,4 +1,4 @@ -AbleToPlaySlotsCheck: ; 2ff09 (b:7f09) +AbleToPlaySlotsCheck: ld a, [wSpriteStateData1 + 2] and $8 jr z, .done ; not able @@ -22,10 +22,10 @@ AbleToPlaySlotsCheck: ; 2ff09 (b:7f09) ld [wCanPlaySlots], a ret -GameCornerCoinCaseText: ; 2ff32 (b:7f32) +GameCornerCoinCaseText: TX_FAR _GameCornerCoinCaseText db "@" -GameCornerNoCoinsText: ; 2ff37 (b:7f37) +GameCornerNoCoinsText: TX_FAR _GameCornerNoCoinsText db "@" diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index fa8faebc..69c059ff 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -1,4 +1,4 @@ -LoadShootingStarGraphics: ; 70000 (1c:4000) +LoadShootingStarGraphics: ld a, $f9 ld [rOBP0], a ld a, $a4 @@ -24,7 +24,7 @@ LoadShootingStarGraphics: ; 70000 (1c:4000) ld bc, GameFreakShootingStarOAMDataEnd - GameFreakShootingStarOAMData jp CopyData -AnimateShootingStar: ; 70044 (1c:4044) +AnimateShootingStar: call LoadShootingStarGraphics ld a, SFX_SHOOTING_STAR call PlaySound @@ -145,11 +145,11 @@ AnimateShootingStar: ; 70044 (1c:4044) and a ret -SmallStarsOAM: ; 700ee (1c:40ee) +SmallStarsOAM: db $00,$00,$A2,$90 SmallStarsOAMEnd: -SmallStarsWaveCoordsPointerTable: ; 700f2 (1c:40f2) +SmallStarsWaveCoordsPointerTable: dw SmallStarsWave1Coords dw SmallStarsWave2Coords dw SmallStarsWave3Coords @@ -160,34 +160,34 @@ SmallStarsWaveCoordsPointerTable: ; 700f2 (1c:40f2) ; The stars that fall from the Gamefreak logo come in 4 waves of 4 OAM entries. ; These arrays contain the Y and X coordinates of each OAM entry. -SmallStarsWave1Coords: ; 700fe (1c:40fe) +SmallStarsWave1Coords: db $68,$30 db $68,$40 db $68,$58 db $68,$78 -SmallStarsWave2Coords: ; 70106 (1c:4106) +SmallStarsWave2Coords: db $68,$38 db $68,$48 db $68,$60 db $68,$70 -SmallStarsWave3Coords: ; 7010e (1c:410e) +SmallStarsWave3Coords: db $68,$34 db $68,$4C db $68,$54 db $68,$64 -SmallStarsWave4Coords: ; 70116 (1c:4116) +SmallStarsWave4Coords: db $68,$3C db $68,$5C db $68,$6C db $68,$74 -SmallStarsEmptyWave: ; 7011e (1c:411e) +SmallStarsEmptyWave: db $FF -MoveDownSmallStars: ; 7011f (1c:411f) +MoveDownSmallStars: ld b, 8 .loop ld hl, wOAMBuffer + $5c @@ -213,7 +213,7 @@ MoveDownSmallStars: ; 7011f (1c:411f) jr nz, .loop ret -GameFreakLogoOAMData: ; 70140 (1c:4140) +GameFreakLogoOAMData: db $48,$50,$8D,$00 db $48,$58,$8E,$00 db $50,$50,$8F,$00 @@ -232,13 +232,13 @@ GameFreakLogoOAMData: ; 70140 (1c:4140) db $60,$78,$86,$00 GameFreakLogoOAMDataEnd: -GameFreakShootingStarOAMData: ; 70180 (1c:4180) +GameFreakShootingStarOAMData: db $00,$A0,$A0,$10 db $00,$A8,$A0,$30 db $08,$A0,$A1,$10 db $08,$A8,$A1,$30 GameFreakShootingStarOAMDataEnd: -FallingStar: ; 70190 (1c:4190) +FallingStar: INCBIN "gfx/falling_star.2bpp" FallingStarEnd: diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 33e7b426..549a042d 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -1,4 +1,4 @@ -_GivePokemon: ; 4fda5 (13:7da5) +_GivePokemon: ; returns success in carry ; and whether the mon was added to the party in [wAddedToParty] call EnableAutoTextBoxDrawing @@ -51,7 +51,7 @@ _GivePokemon: ; 4fda5 (13:7da5) scf ret -SetPokedexOwnedFlag: ; 4fe11 (13:7e11) +SetPokedexOwnedFlag: ld a, [wcf91] push af ld [wd11e], a @@ -68,15 +68,15 @@ SetPokedexOwnedFlag: ; 4fe11 (13:7e11) ld hl, GotMonText jp PrintText -GotMonText: ; 4fe39 (13:7e39) +GotMonText: TX_FAR _GotMonText db $0b db "@" -SetToBoxText: ; 4fe3f (13:7e3f) +SetToBoxText: TX_FAR _SetToBoxText db "@" -BoxIsFullText: ; 4fe44 (13:7e44) +BoxIsFullText: TX_FAR _BoxIsFullText db "@" diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 4225c5a1..0e35f709 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -1,4 +1,4 @@ -AnimateHallOfFame: ; 701a0 (1c:41a0) +AnimateHallOfFame: call HoFFadeOutScreenAndMusic call ClearScreen ld c, 100 @@ -91,10 +91,10 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) res 3, [hl] ret -HallOfFameText: ; 7026b (1c:426b) +HallOfFameText: db "HALL OF FAME@" -HoFShowMonOrPlayer: ; 70278 (1c:4278) +HoFShowMonOrPlayer: call ClearScreen ld a, $d0 ld [hSCY], a @@ -149,14 +149,14 @@ HoFShowMonOrPlayer: ; 70278 (1c:4278) jr nz, .ScrollPic ret -HoFDisplayAndRecordMonInfo: ; 702e1 (1c:42e1) +HoFDisplayAndRecordMonInfo: ld a, [wHoFPartyMonIndex] ld hl, wPartyMonNicks call GetPartyMonName call HoFDisplayMonInfo jp HoFRecordMonInfo -HoFDisplayMonInfo: ; 702f0 (1c:42f0) +HoFDisplayMonInfo: coord hl, 0, 2 ld b, 9 ld c, 10 @@ -177,12 +177,12 @@ HoFDisplayMonInfo: ; 702f0 (1c:42f0) ld a, [wHoFMonSpecies] jp PlayCry -HoFMonInfoText: ; 70329 (1c:4329) +HoFMonInfoText: db "LEVEL/" next "TYPE1/" next "TYPE2/@" -HoFLoadPlayerPics: ; 7033e (1c:433e) +HoFLoadPlayerPics: ld de, RedPicFront ld a, BANK(RedPicFront) call UncompressSpriteFromDE @@ -200,13 +200,13 @@ HoFLoadPlayerPics: ; 7033e (1c:433e) call InterlaceMergeSpriteBuffers ld c, $1 -HoFLoadMonPlayerPicTileIDs: ; 7036d (1c:436d) +HoFLoadMonPlayerPicTileIDs: ; c = base tile ID ld b, 0 coord hl, 12, 5 predef_jump CopyTileIDsFromList -HoFDisplayPlayerStats: ; 70377 (1c:4377) +HoFDisplayPlayerStats: SetEvent EVENT_HALL_OF_FAME_DEX_RATING predef DisplayDexRating coord hl, 0, 4 @@ -245,26 +245,26 @@ HoFDisplayPlayerStats: ; 70377 (1c:4377) call HoFPrintTextAndDelay ld hl, wDexRatingText -HoFPrintTextAndDelay: ; 703e2 (1c:43e2) +HoFPrintTextAndDelay: call PrintText ld c, 120 jp DelayFrames -HoFPlayTimeText: ; 703ea (1c:43ea) +HoFPlayTimeText: db "PLAY TIME@" -HoFMoneyText: ; 703f4 (1c:43f4) +HoFMoneyText: db "MONEY@" -DexSeenOwnedText: ; 703fa (1c:43fa) +DexSeenOwnedText: TX_FAR _DexSeenOwnedText db "@" -DexRatingText: ; 703ff (1c:43ff) +DexRatingText: TX_FAR _DexRatingText db "@" -HoFRecordMonInfo: ; 70404 (1c:4404) +HoFRecordMonInfo: ld hl, wHallOfFame ld bc, HOF_MON ld a, [wHoFPartyMonIndex] @@ -279,7 +279,7 @@ HoFRecordMonInfo: ; 70404 (1c:4404) ld bc, NAME_LENGTH jp CopyData -HoFFadeOutScreenAndMusic: ; 70423 (1c:4423) +HoFFadeOutScreenAndMusic: ld a, 10 ld [wAudioFadeOutCounterReloadValue], a ld [wAudioFadeOutCounter], a diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm index 97187638..7591fac0 100755 --- a/engine/hidden_object_functions14.asm +++ b/engine/hidden_object_functions14.asm @@ -1,16 +1,16 @@ -PrintNotebookText: ; 52996 (14:6996) +PrintNotebookText: call EnableAutoTextBoxDrawing ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, [wHiddenObjectFunctionArgument] jp PrintPredefTextID -TMNotebook: ; 529a4 (14:69a4) +TMNotebook: TX_FAR TMNotebookText db $0d db "@" -ViridianSchoolNotebook: ; 529aa (14:69aa) +ViridianSchoolNotebook: TX_ASM ld hl, ViridianSchoolNotebookText1 call PrintText @@ -31,7 +31,7 @@ ViridianSchoolNotebook: ; 529aa (14:69aa) .doneReading jp TextScriptEnd -TurnPageSchoolNotebook: ; 529db (14:69db) +TurnPageSchoolNotebook: ld hl, TurnPageText call PrintText call YesNoChoice @@ -39,62 +39,62 @@ TurnPageSchoolNotebook: ; 529db (14:69db) and a ret -TurnPageText: ; 529e9 (14:69e9) +TurnPageText: TX_FAR _TurnPageText db "@" -ViridianSchoolNotebookText5: ; 529ee (14:69ee) +ViridianSchoolNotebookText5: TX_FAR _ViridianSchoolNotebookText5 db $0d db "@" -ViridianSchoolNotebookText1: ; 529f4 (14:69f4) +ViridianSchoolNotebookText1: TX_FAR _ViridianSchoolNotebookText1 db "@" -ViridianSchoolNotebookText2: ; 529f9 (14:69f9) +ViridianSchoolNotebookText2: TX_FAR _ViridianSchoolNotebookText2 db "@" -ViridianSchoolNotebookText3: ; 529fe (14:69fe) +ViridianSchoolNotebookText3: TX_FAR _ViridianSchoolNotebookText3 db "@" -ViridianSchoolNotebookText4: ; 52a03 (14:6a03) +ViridianSchoolNotebookText4: TX_FAR _ViridianSchoolNotebookText4 db "@" -PrintFightingDojoText2: ; 52a08 (14:6a08) +PrintFightingDojoText2: call EnableAutoTextBoxDrawing tx_pre_jump FightingDojoText_52a10 -FightingDojoText_52a10: ; 52a10 (14:6a10) +FightingDojoText_52a10: TX_FAR _FightingDojoText_52a10 db "@" -PrintFightingDojoText3: ; 52a15 (14:6a15) +PrintFightingDojoText3: call EnableAutoTextBoxDrawing tx_pre_jump FightingDojoText_52a1d -FightingDojoText_52a1d: ; 52a1d (14:6a1d) +FightingDojoText_52a1d: TX_FAR _FightingDojoText_52a1d db "@" -PrintFightingDojoText: ; 52a22 (14:6a22) +PrintFightingDojoText: call EnableAutoTextBoxDrawing tx_pre_jump FightingDojoText -FightingDojoText: ; 52a2a (14:6a2a) +FightingDojoText: TX_FAR _FightingDojoText db "@" -PrintIndigoPlateauHQText: ; 52a2f (14:6a2f) +PrintIndigoPlateauHQText: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing tx_pre_jump IndigoPlateauHQText -IndigoPlateauHQText: ; 52a3d (14:6a3d) +IndigoPlateauHQText: TX_FAR _IndigoPlateauHQText db "@" diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 67cba382..dee5efea 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -1,19 +1,19 @@ -PrintRedSNESText: ; 5db79 (17:5b79) +PrintRedSNESText: call EnableAutoTextBoxDrawing tx_pre_jump RedBedroomSNESText -RedBedroomSNESText: ; 5db81 (17:5b81) +RedBedroomSNESText: TX_FAR _RedBedroomSNESText db "@" -OpenRedsPC: ; 5db86 (17:5b86) +OpenRedsPC: call EnableAutoTextBoxDrawing tx_pre_jump RedBedroomPCText -RedBedroomPCText: ; 5db8e (17:5b8e) +RedBedroomPCText: TX_PLAYERS_PC -Route15GateLeftBinoculars: ; 5db8f (17:5b8f) +Route15GateLeftBinoculars: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ret nz @@ -24,11 +24,11 @@ Route15GateLeftBinoculars: ; 5db8f (17:5b8f) call PlayCry jp DisplayMonFrontSpriteInBox -Route15UpstairsBinocularsText: ; 5dba8 (17:5ba8) +Route15UpstairsBinocularsText: TX_FAR _Route15UpstairsBinocularsText db "@" -AerodactylFossil: ; 5dbad (17:5bad) +AerodactylFossil: ld a, FOSSIL_AERODACTYL ld [wcf91], a call DisplayMonFrontSpriteInBox @@ -36,11 +36,11 @@ AerodactylFossil: ; 5dbad (17:5bad) tx_pre AerodactylFossilText ret -AerodactylFossilText: ; 5dbbe (17:5bbe) +AerodactylFossilText: TX_FAR _AerodactylFossilText db "@" -KabutopsFossil: ; 5bdc3 (17:5bc3) +KabutopsFossil: ld a, FOSSIL_KABUTOPS ld [wcf91], a call DisplayMonFrontSpriteInBox @@ -48,11 +48,11 @@ KabutopsFossil: ; 5bdc3 (17:5bc3) tx_pre KabutopsFossilText ret -KabutopsFossilText: ; 5dbd4 (17:5bd4) +KabutopsFossilText: TX_FAR _KabutopsFossilText db "@" -DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) +DisplayMonFrontSpriteInBox: ; Displays a pokemon's front sprite in a pop-up window. ; [wcf91] = pokemon interal id number ld a, 1 @@ -81,7 +81,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ld [hWY], a ret -PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a) +PrintBlackboardLinkCableText: call EnableAutoTextBoxDrawing ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -89,7 +89,7 @@ PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a) call PrintPredefTextID ret -LinkCableHelp: ; 5dc29 (17:5c29) +LinkCableHelp: TX_ASM call SaveScreenTilesToBuffer1 ld hl, LinkCableHelpText1 @@ -142,38 +142,38 @@ LinkCableHelp: ; 5dc29 (17:5c29) call LoadScreenTilesFromBuffer1 jp TextScriptEnd -LinkCableHelpText1: ; 5dc9e (17:5c9e) +LinkCableHelpText1: TX_FAR _LinkCableHelpText1 db "@" -LinkCableHelpText2: ; 5dca3 (17:5ca3) +LinkCableHelpText2: TX_FAR _LinkCableHelpText2 db "@" -HowToLinkText: ; 5dca8 (17:5ca8) +HowToLinkText: db "HOW TO LINK" next "COLOSSEUM" next "TRADE CENTER" next "STOP READING@" -LinkCableInfoTexts: ; 5dcd8 (17:5cd8) +LinkCableInfoTexts: dw LinkCableInfoText1 dw LinkCableInfoText2 dw LinkCableInfoText3 -LinkCableInfoText1: ; 5dcde (17:5cde) +LinkCableInfoText1: TX_FAR _LinkCableInfoText1 db "@" -LinkCableInfoText2: ; 5dce3 (17:5ce3) +LinkCableInfoText2: TX_FAR _LinkCableInfoText2 db "@" -LinkCableInfoText3: ; 5dce8 (17:5ce8) +LinkCableInfoText3: TX_FAR _LinkCableInfoText3 db "@" -ViridianSchoolBlackboard: ; 5dced (17:5ced) +ViridianSchoolBlackboard: TX_ASM call SaveScreenTilesToBuffer1 ld hl, ViridianSchoolBlackboardText1 @@ -259,60 +259,60 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) call LoadScreenTilesFromBuffer1 jp TextScriptEnd -ViridianSchoolBlackboardText1: ; 5dda2 (17:5da2) +ViridianSchoolBlackboardText1: TX_FAR _ViridianSchoolBlackboardText1 db "@" -ViridianSchoolBlackboardText2: ; 5dda7 (17:5da7) +ViridianSchoolBlackboardText2: TX_FAR _ViridianSchoolBlackboardText2 db "@" -StatusAilmentText1: ; 5ddac (17:5dac) +StatusAilmentText1: db " SLP" next " PSN" next " PAR@" -StatusAilmentText2: ; 5ddbb (17:5dbb) +StatusAilmentText2: db " BRN" next " FRZ" next " QUIT@@" -ViridianBlackboardStatusPointers: ; 5ddcc (17:5ddc) +ViridianBlackboardStatusPointers: dw ViridianBlackboardSleepText dw ViridianBlackboardPoisonText dw ViridianBlackboardPrlzText dw ViridianBlackboardBurnText dw ViridianBlackboardFrozenText -ViridianBlackboardSleepText: ; 5ddd6 (17:5dd6) +ViridianBlackboardSleepText: TX_FAR _ViridianBlackboardSleepText db "@" -ViridianBlackboardPoisonText: ; 5dddb (17:5ddb) +ViridianBlackboardPoisonText: TX_FAR _ViridianBlackboardPoisonText db "@" -ViridianBlackboardPrlzText: ; 5dde0 (17:5de0) +ViridianBlackboardPrlzText: TX_FAR _ViridianBlackboardPrlzText db "@" -ViridianBlackboardBurnText: ; 5dde5 (17:5de5) +ViridianBlackboardBurnText: TX_FAR _ViridianBlackboardBurnText db "@" -ViridianBlackboardFrozenText: ; 5ddea (17:5dea) +ViridianBlackboardFrozenText: TX_FAR _ViridianBlackboardFrozenText db "@" -PrintTrashText: ; 5ddef (17:5def) +PrintTrashText: call EnableAutoTextBoxDrawing tx_pre_jump VermilionGymTrashText -VermilionGymTrashText: ; 5ddf7 (17:5df7) +VermilionGymTrashText: TX_FAR _VermilionGymTrashText db "@" -GymTrashScript: ; 5ddfc (17:5dfc) +GymTrashScript: call EnableAutoTextBoxDrawing ld a, [wHiddenObjectFunctionArgument] ld [wGymTrashCanIndex], a @@ -410,7 +410,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) .done jp PrintPredefTextID -GymTrashCans: ; 5de7d (17:5e7d) +GymTrashCans: ; byte 0: mask for random number ; bytes 1-4: indices of the trash cans that can have the second lock ; (but see the comment above explaining a bug regarding this) @@ -434,7 +434,7 @@ GymTrashCans: ; 5de7d (17:5e7d) db 2, 11, 13, 0, 0 ; 14 ; 5dec8 -VermilionGymTrashSuccessText1: ; 5dec8 (17:5ec8) +VermilionGymTrashSuccessText1: TX_FAR _VermilionGymTrashSuccessText1 TX_ASM call WaitForSoundToFinish @@ -444,12 +444,12 @@ VermilionGymTrashSuccessText1: ; 5dec8 (17:5ec8) jp TextScriptEnd ; unused -VermilionGymTrashSuccessText2: ; 5dedb (17:5edb) +VermilionGymTrashSuccessText2: TX_FAR _VermilionGymTrashSuccessText2 db "@" ; unused -VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0) +VermilionGymTrashSuccesPlaySfx: TX_ASM call WaitForSoundToFinish ld a, SFX_SWITCH @@ -457,7 +457,7 @@ VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0) call WaitForSoundToFinish jp TextScriptEnd -VermilionGymTrashSuccessText3: ; 5deef (17:5eef) +VermilionGymTrashSuccessText3: TX_FAR _VermilionGymTrashSuccessText3 TX_ASM call WaitForSoundToFinish @@ -466,7 +466,7 @@ VermilionGymTrashSuccessText3: ; 5deef (17:5eef) call WaitForSoundToFinish jp TextScriptEnd -VermilionGymTrashFailText: ; 5df02 (17:5f02) +VermilionGymTrashFailText: TX_FAR _VermilionGymTrashFailText TX_ASM call WaitForSoundToFinish diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index e8b990e5..6ce582ed 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -1,4 +1,4 @@ -GymStatues: ; 62419 (18:6419) +GymStatues: ; if in a gym and have the corresponding badge, a = GymStatueText2_id and jp PrintPredefTextID ; if in a gym and don’t have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID ; else ret @@ -28,7 +28,7 @@ GymStatues: ; 62419 (18:6419) .haveBadge jp PrintPredefTextID -.BadgeFlags: ; 62442 (18:6442) +.BadgeFlags: db PEWTER_GYM, %00000001 db CERULEAN_GYM, %00000010 db VERMILION_GYM,%00000100 @@ -39,15 +39,15 @@ GymStatues: ; 62419 (18:6419) db VIRIDIAN_GYM, %10000000 db $ff -GymStatueText1: ; 62453 (18:6453) +GymStatueText1: TX_FAR _GymStatueText1 db "@" -GymStatueText2: ; 62458 (18:6458) +GymStatueText2: TX_FAR _GymStatueText2 db "@" -PrintBenchGuyText: ; 6245d (18:645d) +PrintBenchGuyText: call EnableAutoTextBoxDrawing ld hl, BenchGuyTextPointers ld a, [wCurMap] @@ -71,7 +71,7 @@ PrintBenchGuyText: ; 6245d (18:645d) jp PrintPredefTextID ; format: db map id, player sprite facing direction, text id of PredefTextIDPointerTable -BenchGuyTextPointers: ; 6247e (18:647e) +BenchGuyTextPointers: db VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT db (ViridianCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 db PEWTER_POKECENTER, SPRITE_FACING_LEFT @@ -98,59 +98,59 @@ BenchGuyTextPointers: ; 6247e (18:647e) db (RockTunnelPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 db $FF -ViridianCityPokecenterBenchGuyText: ; 624a3 (18:64a3) +ViridianCityPokecenterBenchGuyText: TX_FAR _ViridianCityPokecenterGuyText db "@" -PewterCityPokecenterBenchGuyText: ; 624a8 (18:64a8) +PewterCityPokecenterBenchGuyText: TX_FAR _PewterCityPokecenterGuyText db "@" -CeruleanCityPokecenterBenchGuyText: ; 624ad (18:64ad) +CeruleanCityPokecenterBenchGuyText: TX_FAR _CeruleanPokecenterGuyText db "@" -LavenderCityPokecenterBenchGuyText: ; 624b2 (18:64b2) +LavenderCityPokecenterBenchGuyText: TX_FAR _LavenderPokecenterGuyText db "@" -MtMoonPokecenterBenchGuyText: ; 624b7 (18:64b7) +MtMoonPokecenterBenchGuyText: TX_FAR _MtMoonPokecenterBenchGuyText db "@" -RockTunnelPokecenterBenchGuyText: ; 624bc (18:64bc) +RockTunnelPokecenterBenchGuyText: TX_FAR _RockTunnelPokecenterGuyText db "@" -UnusedBenchGuyText1: ; 624c1 (18:64c1) +UnusedBenchGuyText1: TX_FAR _UnusedBenchGuyText1 db "@" -UnusedBenchGuyText2: ; 624c6 (18:64c6) +UnusedBenchGuyText2: TX_FAR _UnusedBenchGuyText2 db "@" -UnusedBenchGuyText3: ; 624cb (18:64cb) +UnusedBenchGuyText3: TX_FAR _UnusedBenchGuyText3 db "@" -VermilionCityPokecenterBenchGuyText: ; 624d0 (18:64d0) +VermilionCityPokecenterBenchGuyText: TX_FAR _VermilionPokecenterGuyText db "@" -CeladonCityPokecenterBenchGuyText: ; 624d5 (18:64d5) +CeladonCityPokecenterBenchGuyText: TX_FAR _CeladonCityPokecenterGuyText db "@" -FuchsiaCityPokecenterBenchGuyText: ; 624da (18:64da) +FuchsiaCityPokecenterBenchGuyText: TX_FAR _FuchsiaCityPokecenterGuyText db "@" -CinnabarIslandPokecenterBenchGuyText: ; 624df (18:64df) +CinnabarIslandPokecenterBenchGuyText: TX_FAR _CinnabarPokecenterGuyText db "@" -SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4) +SaffronCityPokecenterBenchGuyText: TX_ASM CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SaffronCityPokecenterBenchGuyText2 @@ -160,32 +160,32 @@ SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4) call PrintText jp TextScriptEnd -SaffronCityPokecenterBenchGuyText1: ; 624f8 (18:64f8) +SaffronCityPokecenterBenchGuyText1: TX_FAR _SaffronCityPokecenterGuyText1 db "@" -SaffronCityPokecenterBenchGuyText2: ; 624fd (18:64fd) +SaffronCityPokecenterBenchGuyText2: TX_FAR _SaffronCityPokecenterGuyText2 db "@" -CeladonCityHotelText: ; 62502 (18:6502) +CeladonCityHotelText: TX_FAR _CeladonCityHotelText db "@" ret -UnusedPredefText: ; 62508 (18:6508) +UnusedPredefText: db "@" -PrintBookcaseText: ; 6509 (18:6509) +PrintBookcaseText: call EnableAutoTextBoxDrawing tx_pre_jump BookcaseText -BookcaseText: ; 62511 (18:6511) +BookcaseText: TX_FAR _BookcaseText db "@" -OpenPokemonCenterPC: ; 62516 (18:6516) +OpenPokemonCenterPC: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ; check to see if player is facing up ret nz @@ -194,5 +194,5 @@ OpenPokemonCenterPC: ; 62516 (18:6516) ld [wAutoTextBoxDrawingControl], a tx_pre_jump PokemonCenterPCText -PokemonCenterPCText: ; 62529 (18:6529) +PokemonCenterPCText: TX_POKECENTER_PC diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index d6e25cec..efdbd081 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -1,5 +1,5 @@ ; prints text for bookshelves in buildings without sign events -PrintBookshelfText: ; fb50 (3:7b50) +PrintBookshelfText: ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_UP jr nz, .noMatch @@ -37,7 +37,7 @@ PrintBookshelfText: ; fb50 (3:7b50) jpba PrintCardKeyText ; format: db tileset id, bookshelf tile id, text id -BookshelfTileIDs: ; fb8b (3:7b8b) +BookshelfTileIDs: db PLATEAU, $30 db (IndigoPlateauStatues_id - TextPredefs) / 2 + 1 db HOUSE, $3D @@ -74,7 +74,7 @@ BookshelfTileIDs: ; fb8b (3:7b8b) db (BookOrSculptureText_id - TextPredefs) / 2 + 1 db $FF -IndigoPlateauStatues: ; fbbf (3:7bbf) +IndigoPlateauStatues: TX_ASM ld hl, IndigoPlateauStatuesText1 call PrintText @@ -87,19 +87,19 @@ IndigoPlateauStatues: ; fbbf (3:7bbf) call PrintText jp TextScriptEnd -IndigoPlateauStatuesText1: ; fbd9 (3:7bd9) +IndigoPlateauStatuesText1: TX_FAR _IndigoPlateauStatuesText1 db "@" -IndigoPlateauStatuesText2: ; fbde (3:7bde) +IndigoPlateauStatuesText2: TX_FAR _IndigoPlateauStatuesText2 db "@" -IndigoPlateauStatuesText3: ; fbe3 (3:7be3) +IndigoPlateauStatuesText3: TX_FAR _IndigoPlateauStatuesText3 db "@" -BookOrSculptureText: ; fbe8 (3:7be8) +BookOrSculptureText: TX_ASM ld hl, PokemonBooksText ld a, [wCurMapTileset] @@ -113,19 +113,19 @@ BookOrSculptureText: ; fbe8 (3:7be8) call PrintText jp TextScriptEnd -PokemonBooksText: ; fc03 (3:7c03) +PokemonBooksText: TX_FAR _PokemonBooksText db "@" -DiglettSculptureText: ; fc08 (3:7c08) +DiglettSculptureText: TX_FAR _DiglettSculptureText db "@" -ElevatorText: ; fc0d (3:7c0d) +ElevatorText: TX_FAR _ElevatorText db "@" -TownMapText: ; fc12 (3:7c12) +TownMapText: TX_FAR _TownMapText db $06 TX_ASM @@ -148,6 +148,6 @@ TownMapText: ; fc12 (3:7c12) push af jp CloseTextDisplay -PokemonStuffText: ; fc45 (3:7c45) +PokemonStuffText: TX_FAR _PokemonStuffText db "@" diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 7ab0637b..9b1532bc 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -1,20 +1,20 @@ -PrintNewBikeText: ; 1e94b (7:694b) +PrintNewBikeText: call EnableAutoTextBoxDrawing tx_pre_jump NewBicycleText -NewBicycleText: ; 1e953 (7:6953) +NewBicycleText: TX_FAR _NewBicycleText db "@" -DisplayOakLabLeftPoster: ; 1e958 (7:6958) +DisplayOakLabLeftPoster: call EnableAutoTextBoxDrawing tx_pre_jump PushStartText -PushStartText: ; 1e960 (7:6960) +PushStartText: TX_FAR _PushStartText db "@" -DisplayOakLabRightPoster: ; 1e965 (7:6965) +DisplayOakLabRightPoster: call EnableAutoTextBoxDrawing ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned @@ -28,15 +28,15 @@ DisplayOakLabRightPoster: ; 1e965 (7:6965) .ownLessThanTwo jp PrintPredefTextID -SaveOptionText: ; 1e97e (7:697e) +SaveOptionText: TX_FAR _SaveOptionText db "@" -StrengthsAndWeaknessesText: ; 1e983 (7:6983) +StrengthsAndWeaknessesText: TX_FAR _StrengthsAndWeaknessesText db "@" -SafariZoneCheck: ; 1e988 (7:6988) +SafariZoneCheck: CheckEventHL EVENT_IN_SAFARI_ZONE ; if we are not in the Safari Zone, jr z, SafariZoneGameStillGoing ; don't bother printing game over text ld a, [wNumSafariBalls] @@ -44,7 +44,7 @@ SafariZoneCheck: ; 1e988 (7:6988) jr z, SafariZoneGameOver jr SafariZoneGameStillGoing -SafariZoneCheckSteps: ; 1e997 (7:6997) +SafariZoneCheckSteps: ld a, [wSafariSteps] ld b, a ld a, [wSafariSteps + 1] @@ -56,12 +56,12 @@ SafariZoneCheckSteps: ; 1e997 (7:6997) ld [wSafariSteps], a ld a, c ld [wSafariSteps + 1], a -SafariZoneGameStillGoing: ; 1e9ab (7:69ab) +SafariZoneGameStillGoing: xor a ld [wSafariZoneGameOver], a ret -SafariZoneGameOver: ; 1e9b0 (7:69b0) +SafariZoneGameOver: call EnableAutoTextBoxDrawing xor a ld [wAudioFadeOutControl], a @@ -90,13 +90,13 @@ SafariZoneGameOver: ; 1e9b0 (7:69b0) ld [wSafariZoneGameOver], a ret -PrintSafariGameOverText: ; 1e9ed (7:69ed) +PrintSafariGameOverText: xor a ld [wJoyIgnore], a ld hl, SafariGameOverText jp PrintText -SafariGameOverText: ; 1e9f7 (7:69f7) +SafariGameOverText: TX_ASM ld a, [wNumSafariBalls] and a @@ -108,22 +108,22 @@ SafariGameOverText: ; 1e9f7 (7:69f7) call PrintText jp TextScriptEnd -TimesUpText: ; 1ea0d (7:6a0d) +TimesUpText: TX_FAR _TimesUpText db "@" -GameOverText: ; 1ea12 (7:6a12) +GameOverText: TX_FAR _GameOverText db "@" -PrintCinnabarQuiz: ; 1ea17 (7:6a17) +PrintCinnabarQuiz: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing tx_pre_jump CinnabarGymQuiz -CinnabarGymQuiz: ; 1ea25 (7:6a25) +CinnabarGymQuiz: TX_ASM xor a ld [wOpponentAfterWrongAnswer], a @@ -153,11 +153,11 @@ CinnabarGymQuiz: ; 1ea25 (7:6a25) call CinnabarGymQuiz_1ea92 jp TextScriptEnd -CinnabarGymQuizIntroText: ; 1ea5b (7:6a5b) +CinnabarGymQuizIntroText: TX_FAR _CinnabarGymQuizIntroText db "@" -CinnabarQuizQuestions: ; 1ea60 (7:6a60) +CinnabarQuizQuestions: dw CinnabarQuizQuestionsText1 dw CinnabarQuizQuestionsText2 dw CinnabarQuizQuestionsText3 @@ -165,35 +165,35 @@ CinnabarQuizQuestions: ; 1ea60 (7:6a60) dw CinnabarQuizQuestionsText5 dw CinnabarQuizQuestionsText6 -CinnabarQuizQuestionsText1: ; 1ea6c (7:6a6c) +CinnabarQuizQuestionsText1: TX_FAR _CinnabarQuizQuestionsText1 db "@" -CinnabarQuizQuestionsText2: ; 1ea71 (7:6a71) +CinnabarQuizQuestionsText2: TX_FAR _CinnabarQuizQuestionsText2 db "@" -CinnabarQuizQuestionsText3: ; 1ea76 (7:6a76) +CinnabarQuizQuestionsText3: TX_FAR _CinnabarQuizQuestionsText3 db "@" -CinnabarQuizQuestionsText4: ; 1ea7b (7:6a7b) +CinnabarQuizQuestionsText4: TX_FAR _CinnabarQuizQuestionsText4 db "@" -CinnabarQuizQuestionsText5: ; 1ea80 (7:6a80) +CinnabarQuizQuestionsText5: TX_FAR _CinnabarQuizQuestionsText5 db "@" -CinnabarQuizQuestionsText6: ; 1ea85 (7:6a85) +CinnabarQuizQuestionsText6: TX_FAR _CinnabarQuizQuestionsText6 db "@" -CinnabarGymGateFlagAction: ; 1ea8a (7:6a8a) +CinnabarGymGateFlagAction: EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED predef_jump FlagActionPredef -CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) +CinnabarGymQuiz_1ea92: call YesNoChoice ld a, [$ffdc] ld c, a @@ -234,7 +234,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) ld [wOpponentAfterWrongAnswer], a ret -CinnabarGymQuizCorrectText: ; 1eae3 (7:6ae3) +CinnabarGymQuizCorrectText: db $0b TX_FAR _CinnabarGymQuizCorrectText db $06 @@ -254,11 +254,11 @@ CinnabarGymQuizCorrectText: ; 1eae3 (7:6ae3) call WaitForSoundToFinish jp TextScriptEnd -CinnabarGymQuizIncorrectText: ; 1eb05 (7:6b05) +CinnabarGymQuizIncorrectText: TX_FAR _CinnabarGymQuizIncorrectText db "@" -UpdateCinnabarGymGateTileBlocks_: ; 1eb0a (7:6b0a) +UpdateCinnabarGymGateTileBlocks_: ; Update the overworld map with open floor blocks or locked gate blocks ; depending on event flags. ld a, 6 @@ -301,7 +301,7 @@ UpdateCinnabarGymGateTileBlocks_: ; 1eb0a (7:6b0a) jr nz, .loop ret -CinnabarGymGateCoords: ; 1eb48 (7:6b48) +CinnabarGymGateCoords: ; format: x-coord, y-coord, direction, padding ; direction: $54 = horizontal gate, $5f = vertical gate db $09,$03,$54,$00 @@ -311,16 +311,16 @@ CinnabarGymGateCoords: ; 1eb48 (7:6b48) db $02,$06,$54,$00 db $02,$03,$54,$00 -PrintMagazinesText: ; 1eb60 (7:6b60) +PrintMagazinesText: call EnableAutoTextBoxDrawing tx_pre MagazinesText ret -MagazinesText: ; 1eb69 (7:6b69) +MagazinesText: TX_FAR _MagazinesText db "@" -BillsHousePC: ; 1eb6e (7:6b6e) +BillsHousePC: call EnableAutoTextBoxDrawing ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP @@ -366,11 +366,11 @@ BillsHousePC: ; 1eb6e (7:6b6e) tx_pre BillsHousePokemonList ret -BillsHouseMonitorText: ; 1ebdd (7:6bdd) +BillsHouseMonitorText: TX_FAR _BillsHouseMonitorText db "@" -BillsHouseInitiatedText: ; 1ebe2 (7:6be2) +BillsHouseInitiatedText: TX_FAR _BillsHouseInitiatedText db $06 TX_ASM @@ -386,7 +386,7 @@ BillsHouseInitiatedText: ; 1ebe2 (7:6be2) call DelayFrames jp TextScriptEnd -BillsHousePokemonList: ; 1ec05 (7:6c05) +BillsHousePokemonList: TX_ASM call SaveScreenTilesToBuffer1 ld hl, BillsHousePokemonListText1 @@ -440,28 +440,28 @@ BillsHousePokemonList: ; 1ec05 (7:6c05) call LoadScreenTilesFromBuffer2 jp TextScriptEnd -BillsHousePokemonListText1: ; 1ec7f (7:6c7f) +BillsHousePokemonListText1: TX_FAR _BillsHousePokemonListText1 db "@" -BillsMonListText: ; 1ec84 (7:6c84) +BillsMonListText: db "EEVEE" next "FLAREON" next "JOLTEON" next "VAPOREON" next "CANCEL@" -BillsHousePokemonListText2: ; 1ecaa (7:6caa) +BillsHousePokemonListText2: TX_FAR _BillsHousePokemonListText2 db "@" -DisplayOakLabEmailText: ; 1ecaf (7:6caf) +DisplayOakLabEmailText: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing tx_pre_jump OakLabEmailText -OakLabEmailText: ; 1ecbd (7:6cbd) +OakLabEmailText: TX_FAR _OakLabEmailText db "@" diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm index 792661ab..3fa01208 100755 --- a/engine/hp_bar.asm +++ b/engine/hp_bar.asm @@ -1,9 +1,9 @@ -HPBarLength: ; f9dc (3:79dc) +HPBarLength: call GetPredefRegisters ; calculates bc * 48 / de, the number of pixels the HP bar has ; the result is always at least 1 -GetHPBarLength: ; f9df (3:79df) +GetHPBarLength: push hl xor a ld hl, H_MULTIPLICAND @@ -45,7 +45,7 @@ GetHPBarLength: ; f9df (3:79df) ret ; predef $48 -UpdateHPBar: ; fa1d (3:7a1d) +UpdateHPBar: UpdateHPBar2: push hl ld hl, wHPBarOldHP @@ -136,7 +136,7 @@ UpdateHPBar2: ; animates the HP bar going up or down for (a) ticks (two waiting frames each) ; stops prematurely if bar is filled up ; e: current health (in pixels) to start with -UpdateHPBar_AnimateHPBar: ; fab1 (3:7ab1) +UpdateHPBar_AnimateHPBar: push hl .barAnimationLoop push af @@ -162,7 +162,7 @@ UpdateHPBar_AnimateHPBar: ; fab1 (3:7ab1) ret ; compares old HP and new HP and sets c and z flags accordingly -UpdateHPBar_CompareNewHPToOldHP: ; fad1 (3:7ad1) +UpdateHPBar_CompareNewHPToOldHP: ld a, d sub b ret nz @@ -171,7 +171,7 @@ UpdateHPBar_CompareNewHPToOldHP: ; fad1 (3:7ad1) ret ; calcs HP difference between bc and de (into de) -UpdateHPBar_CalcHPDifference: ; fad7 (3:7ad7) +UpdateHPBar_CalcHPDifference: ld a, d sub b jr c, .oldHPGreater @@ -200,7 +200,7 @@ UpdateHPBar_CalcHPDifference: ; fad7 (3:7ad7) ld de, $0 ret -UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5) +UpdateHPBar_PrintHPNumber: push af push de ld a, [wHPBarType] @@ -240,7 +240,7 @@ UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5) ; calcs number of HP bar pixels for old and new HP value ; d: new pixels ; e: old pixels -UpdateHPBar_CalcOldNewHPBarPixels: ; fb30 (3:7b30) +UpdateHPBar_CalcOldNewHPBarPixels: push hl ld hl, wHPBarMaxHP ld a, [hli] ; max HP into de diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index 176d6af7..bacf531b 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -1,4 +1,4 @@ -DoInGameTradeDialogue: ; 71ad9 (1c:5ad9) +DoInGameTradeDialogue: ; trigger the trade offer/action specified by wWhichTrade call SaveScreenTilesToBuffer2 ld hl,TradeMons @@ -75,7 +75,7 @@ DoInGameTradeDialogue: ; 71ad9 (1c:5ad9) jp PrintText ; copies name of species a to hl -InGameTrade_GetMonName: ; 71b6a (1c:5b6a) +InGameTrade_GetMonName: push de ld [wd11e],a call GetMonName @@ -86,7 +86,7 @@ InGameTrade_GetMonName: ; 71b6a (1c:5b6a) INCLUDE "data/trades.asm" -InGameTrade_DoTrade: ; 71c07 (1c:5c07) +InGameTrade_DoTrade: xor a ; NORMAL_PARTY_MENU ld [wPartyMenuTypeOrMessageID],a dec a @@ -150,7 +150,7 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) ld [wInGameTradeTextPointerTableIndex],a ret -InGameTrade_RestoreScreen: ; 71ca2 (1c:5ca2) +InGameTrade_RestoreScreen: call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns call ReloadTilesetTilePatterns @@ -161,7 +161,7 @@ InGameTrade_RestoreScreen: ; 71ca2 (1c:5ca2) call DelayFrames jpba LoadWildData -InGameTrade_PrepareTradeData: ; 71cc1 (1c:5cc1) +InGameTrade_PrepareTradeData: ld hl, wTradedPlayerMonSpecies ld a, [wInGameTradeGiveMonSpecies] ld [hli], a ; wTradedPlayerMonSpecies @@ -191,7 +191,7 @@ InGameTrade_PrepareTradeData: ; 71cc1 (1c:5cc1) ld de, wTradedEnemyMonOTID jp CopyData -InGameTrade_CopyData: ; 71d11 (1c:5d11) +InGameTrade_CopyData: push hl push bc call CopyData @@ -199,7 +199,7 @@ InGameTrade_CopyData: ; 71d11 (1c:5d11) pop hl ret -InGameTrade_CopyDataToReceivedMon: ; 71d19 (1c:5d19) +InGameTrade_CopyDataToReceivedMon: ld hl, wPartyMonNicks ld bc, NAME_LENGTH call InGameTrade_GetReceivedMonPointer @@ -221,7 +221,7 @@ InGameTrade_CopyDataToReceivedMon: ; 71d19 (1c:5d19) ; the received mon's index is (partyCount - 1), ; so this adds bc to hl (partyCount - 1) times and moves the result to de -InGameTrade_GetReceivedMonPointer: ; 71d4f (1c:5d4f) +InGameTrade_GetReceivedMonPointer: ld a, [wPartyCount] dec a call AddNTimes @@ -229,100 +229,100 @@ InGameTrade_GetReceivedMonPointer: ; 71d4f (1c:5d4f) ld d, h ret -InGameTrade_TrainerString: ; 71d59 (1c:5d59) +InGameTrade_TrainerString: ; "TRAINER@@@@@@@@@@" db $5d, "@@@@@@@@@@" -InGameTradeTextPointers: ; 71d64 (1c:5d64) +InGameTradeTextPointers: dw TradeTextPointers1 dw TradeTextPointers2 dw TradeTextPointers3 -TradeTextPointers1: ; 71d6a (1c:5d6a) +TradeTextPointers1: dw WannaTrade1Text dw NoTrade1Text dw WrongMon1Text dw Thanks1Text dw AfterTrade1Text -TradeTextPointers2: ; 71d74 (1c:5d74) +TradeTextPointers2: dw WannaTrade2Text dw NoTrade2Text dw WrongMon2Text dw Thanks2Text dw AfterTrade2Text -TradeTextPointers3: ; 71d7e (1c:5d7e) +TradeTextPointers3: dw WannaTrade3Text dw NoTrade3Text dw WrongMon3Text dw Thanks3Text dw AfterTrade3Text -ConnectCableText: ; 71d88 (1c:5d88) +ConnectCableText: TX_FAR _ConnectCableText db "@" -TradedForText: ; 71d8d (1c:5d8d) +TradedForText: TX_FAR _TradedForText db $11, $a, "@" -WannaTrade1Text: ; 71d94 (1c:5d94) +WannaTrade1Text: TX_FAR _WannaTrade1Text db "@" -NoTrade1Text: ; 71d99 (1c:5d99) +NoTrade1Text: TX_FAR _NoTrade1Text db "@" -WrongMon1Text: ; 71d9e (1c:5d9e) +WrongMon1Text: TX_FAR _WrongMon1Text db "@" -Thanks1Text: ; 71da3 (1c:5da3) +Thanks1Text: TX_FAR _Thanks1Text db "@" -AfterTrade1Text: ; 71da8 (1c:5da8) +AfterTrade1Text: TX_FAR _AfterTrade1Text db "@" -WannaTrade2Text: ; 71dad (1c:5dad) +WannaTrade2Text: TX_FAR _WannaTrade2Text db "@" -NoTrade2Text: ; 71db2 (1c:5db2) +NoTrade2Text: TX_FAR _NoTrade2Text db "@" -WrongMon2Text: ; 71db7 (1c:5db7) +WrongMon2Text: TX_FAR _WrongMon2Text db "@" -Thanks2Text: ; 71dbc (1c:5dbc) +Thanks2Text: TX_FAR _Thanks2Text db "@" -AfterTrade2Text: ; 71dc1 (1c:5dc1) +AfterTrade2Text: TX_FAR _AfterTrade2Text db "@" -WannaTrade3Text: ; 71dc6 (1c:5dc6) +WannaTrade3Text: TX_FAR _WannaTrade3Text db "@" -NoTrade3Text: ; 71dcb (1c:5dcb) +NoTrade3Text: TX_FAR _NoTrade3Text db "@" -WrongMon3Text: ; 71dd0 (1c:5dd0) +WrongMon3Text: TX_FAR _WrongMon3Text db "@" -Thanks3Text: ; 71dd5 (1c:5dd5) +Thanks3Text: TX_FAR _Thanks3Text db "@" -AfterTrade3Text: ; 71dda (1c:5dda) +AfterTrade3Text: TX_FAR _AfterTrade3Text db "@" diff --git a/engine/intro.asm b/engine/intro.asm index e0c8242c..320267c7 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -2,7 +2,7 @@ MOVE_GENGAR_RIGHT EQU $00 MOVE_GENGAR_LEFT EQU $01 MOVE_NIDORINO_RIGHT EQU $ff -PlayIntro: ; 41682 (10:5682) +PlayIntro: xor a ld [hJoyHeld], a inc a @@ -17,7 +17,7 @@ PlayIntro: ; 41682 (10:5682) call DelayFrame ret -PlayIntroScene: ; 4169d (10:569d) +PlayIntroScene: ld b, SET_PAL_NIDORINO_INTRO call RunPaletteCommand ld a, %11100100 @@ -137,7 +137,7 @@ PlayIntroScene: ; 4169d (10:569d) ld de, IntroNidorinoAnimation7 jp AnimateIntroNidorino -AnimateIntroNidorino: ; 41793 (10:5793) +AnimateIntroNidorino: ld a, [de] cp $50 ret z @@ -154,7 +154,7 @@ AnimateIntroNidorino: ; 41793 (10:5793) inc de jr AnimateIntroNidorino -UpdateIntroNidorinoOAM: ; 417ae (10:57ae) +UpdateIntroNidorinoOAM: ld hl, wOAMBuffer ld a, [wIntroNidorinoBaseTile] ld d, a @@ -173,7 +173,7 @@ UpdateIntroNidorinoOAM: ; 417ae (10:57ae) jr nz, .loop ret -InitIntroNidorinoOAM: ; 417c7 (10:57c7) +InitIntroNidorinoOAM: ld hl, wOAMBuffer ld d, 0 .loop @@ -202,17 +202,17 @@ InitIntroNidorinoOAM: ; 417c7 (10:57c7) jr nz, .loop ret -IntroClearScreen: ; 417f0 (10:57f0) +IntroClearScreen: ld hl, vBGMap1 ld bc, $240 jr IntroClearCommon -IntroClearMiddleOfScreen: ; 417f8 (10:57f8) +IntroClearMiddleOfScreen: ; clear the area of the tile map between the black bars on the top and bottom coord hl, 0, 4 ld bc, SCREEN_WIDTH * 10 -IntroClearCommon: ; 417fe (10:57fe) +IntroClearCommon: ld [hl], $0 inc hl dec bc @@ -221,7 +221,7 @@ IntroClearCommon: ; 417fe (10:57fe) jr nz, IntroClearCommon ret -IntroPlaceBlackTiles: ; 41807 (10:5807) +IntroPlaceBlackTiles: ld a, $1 .loop ld [hli], a @@ -229,7 +229,7 @@ IntroPlaceBlackTiles: ; 41807 (10:5807) jr nz, .loop ret -IntroMoveMon: ; 4180e (10:580e) +IntroMoveMon: ; d = number of times to move the mon (2 pixels each time) ; e: $00 = move Gengar right, $01 = move Gengar left, $ff = move Nidorino right ld a, e @@ -266,20 +266,20 @@ IntroMoveMon: ; 4180e (10:580e) jr nz, IntroMoveMon ret -IntroCopyTiles: ; 4183f (10:583f) +IntroCopyTiles: coord hl, 13, 7 -CopyTileIDsFromList_ZeroBaseTileID: ; 41842 (10:5842) +CopyTileIDsFromList_ZeroBaseTileID: ld c, 0 predef_jump CopyTileIDsFromList -PlayMoveSoundB: ; 41849 (10:5849) +PlayMoveSoundB: ; unused predef GetMoveSoundB ld a, b jp PlaySound -LoadIntroGraphics: ; 41852 (10:5852) +LoadIntroGraphics: ld hl, FightIntroBackMon ld de, vChars2 ld bc, FightIntroBackMonEnd - FightIntroBackMon @@ -301,7 +301,7 @@ LoadIntroGraphics: ; 41852 (10:5852) ld a, BANK(FightIntroFrontMon) jp FarCopyData2 -PlayShootingStar: ; 4188a (10:588a) +PlayShootingStar: ld b, SET_PAL_GAME_FREAK_INTRO call RunPaletteCommand callba LoadCopyrightAndTextBoxTiles @@ -338,7 +338,7 @@ PlayShootingStar: ; 4188a (10:588a) call ClearSprites jp Delay3 -IntroDrawBlackBars: ; 418e9 (10:58e9) +IntroDrawBlackBars: ; clear the screen and draw black bars on the top and bottom call IntroClearScreen coord hl, 0, 0 @@ -354,14 +354,14 @@ IntroDrawBlackBars: ; 418e9 (10:58e9) ld c, $80 jp IntroPlaceBlackTiles -EmptyFunc4: ; 4190c (10:590c) +EmptyFunc4: ret -IntroNidorinoAnimation0: ; 4190d (10:590d) +IntroNidorinoAnimation0: db 0, 0 db $50 -IntroNidorinoAnimation1: ; 41910 (10:5910) +IntroNidorinoAnimation1: ; This is a sequence of pixel movements for part of the Nidorino animation. This ; list describes how Nidorino should hop. ; First byte is y movement, second byte is x movement @@ -372,7 +372,7 @@ IntroNidorinoAnimation1: ; 41910 (10:5910) db 2, 2 db $50 ; list terminator -IntroNidorinoAnimation2: ; 4191b (10:591b) +IntroNidorinoAnimation2: ; This is a sequence of pixel movements for part of the Nidorino animation. ; First byte is y movement, second byte is x movement db 0, 0 @@ -382,7 +382,7 @@ IntroNidorinoAnimation2: ; 4191b (10:591b) db 2, -2 db $50 ; list terminator -IntroNidorinoAnimation3: ; 41926 (10:5926) +IntroNidorinoAnimation3: ; This is a sequence of pixel movements for part of the Nidorino animation. ; First byte is y movement, second byte is x movement db 0, 0 @@ -392,7 +392,7 @@ IntroNidorinoAnimation3: ; 41926 (10:5926) db 12, 6 db $50 ; list terminator -IntroNidorinoAnimation4: ; 41931 (10:5931) +IntroNidorinoAnimation4: ; This is a sequence of pixel movements for part of the Nidorino animation. ; First byte is y movement, second byte is x movement db 0, 0 @@ -402,7 +402,7 @@ IntroNidorinoAnimation4: ; 41931 (10:5931) db 8, -4 db $50 ; list terminator -IntroNidorinoAnimation5: ; 4193c (10:593c) +IntroNidorinoAnimation5: ; This is a sequence of pixel movements for part of the Nidorino animation. ; First byte is y movement, second byte is x movement db 0, 0 @@ -412,7 +412,7 @@ IntroNidorinoAnimation5: ; 4193c (10:593c) db 8, 4 db $50 ; list terminator -IntroNidorinoAnimation6: ; 41947 (10:5947) +IntroNidorinoAnimation6: ; This is a sequence of pixel movements for part of the Nidorino animation. ; First byte is y movement, second byte is x movement db 0, 0 @@ -421,7 +421,7 @@ IntroNidorinoAnimation6: ; 41947 (10:5947) db 0, 0 db $50 ; list terminator -IntroNidorinoAnimation7: ; 41950 (10:5950) +IntroNidorinoAnimation7: ; This is a sequence of pixel movements for part of the Nidorino animation. ; First byte is y movement, second byte is x movement db -8, -16 @@ -430,17 +430,17 @@ IntroNidorinoAnimation7: ; 41950 (10:5950) db -4, -10 db $50 ; list terminator -GameFreakIntro: ; 41959 (10:5959) +GameFreakIntro: INCBIN "gfx/gamefreak_intro.2bpp" INCBIN "gfx/gamefreak_logo.2bpp" ds $10 ; blank tile GameFreakIntroEnd: -FightIntroBackMon: ; 41a99 (10:5a99) +FightIntroBackMon: INCBIN "gfx/intro_fight.2bpp" FightIntroBackMonEnd: -FightIntroFrontMon: ; 42099 (10:6099) +FightIntroFrontMon: IF DEF(_RED) INCBIN "gfx/red/intro_nido_1.6x6.2bpp" diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index d638b0b8..7c15d4bb 100755 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm @@ -1,4 +1,4 @@ -HiddenItemNear: ; 7481f (1d:481f) +HiddenItemNear: ld hl, HiddenItemCoords ld b, 0 .loop @@ -43,7 +43,7 @@ HiddenItemNear: ; 7481f (1d:481f) scf ret -Sub5ClampTo0: ; 7486b (1d:486b) +Sub5ClampTo0: ; subtract 5 but clamp to 0 sub 5 cp $f0 diff --git a/engine/items/items.asm b/engine/items/items.asm index 1dd0a6f7..a6717494 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1,4 +1,4 @@ -UseItem_: ; d5c7 (3:55c7) +UseItem_: ld a,1 ld [wActionResultOrTookBattleTurn],a ; initialise to success value ld a,[wcf91] ;contains item_ID @@ -15,7 +15,7 @@ UseItem_: ; d5c7 (3:55c7) ld l,a jp [hl] -ItemUsePtrTable: ; d5e1 (3:55e1) +ItemUsePtrTable: dw ItemUseBall ; MASTER_BALL dw ItemUseBall ; ULTRA_BALL dw ItemUseBall ; GREAT_BALL @@ -100,7 +100,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw ItemUsePPRestore ; ELIXER dw ItemUsePPRestore ; MAX_ELIXER -ItemUseBall: ; d687 (3:5687) +ItemUseBall: ; Balls can't be used out of battle. ld a,[wIsInBattle] @@ -583,56 +583,56 @@ ItemUseBall: ; d687 (3:5687) ld [wItemQuantity],a jp RemoveItemFromInventory -ItemUseBallText00: ; d937 (3:5937) +ItemUseBallText00: ;"It dodged the thrown ball!" ;"This pokemon can't be caught" TX_FAR _ItemUseBallText00 db "@" -ItemUseBallText01: ; d93c (3:593c) +ItemUseBallText01: ;"You missed the pokemon!" TX_FAR _ItemUseBallText01 db "@" -ItemUseBallText02: ; d941 (3:5941) +ItemUseBallText02: ;"Darn! The pokemon broke free!" TX_FAR _ItemUseBallText02 db "@" -ItemUseBallText03: ; d946 (3:5946) +ItemUseBallText03: ;"Aww! It appeared to be caught!" TX_FAR _ItemUseBallText03 db "@" -ItemUseBallText04: ; d94b (3:594b) +ItemUseBallText04: ;"Shoot! It was so close too!" TX_FAR _ItemUseBallText04 db "@" -ItemUseBallText05: ; d950 (3:5950) +ItemUseBallText05: ;"All right! {MonName} was caught!" ;play sound TX_FAR _ItemUseBallText05 db $12,$06 db "@" -ItemUseBallText07: ; d957 (3:5957) +ItemUseBallText07: ;"X was transferred to Bill's PC" TX_FAR _ItemUseBallText07 db "@" -ItemUseBallText08: ; d95c (3:595c) +ItemUseBallText08: ;"X was transferred to someone's PC" TX_FAR _ItemUseBallText08 db "@" -ItemUseBallText06: ; d961 (3:5961) +ItemUseBallText06: ;"New DEX data will be added..." ;play sound TX_FAR _ItemUseBallText06 db $13,$06 db "@" -ItemUseTownMap: ; d968 (3:5968) +ItemUseTownMap: ld a,[wIsInBattle] and a jp nz,ItemUseNotTime jpba DisplayTownMap -ItemUseBicycle: ; d977 (3:5977) +ItemUseBicycle: ld a,[wIsInBattle] and a jp nz,ItemUseNotTime @@ -663,7 +663,7 @@ ItemUseBicycle: ; d977 (3:5977) jp PrintText ; used for Surf out-of-battle effect -ItemUseSurfboard: ; d9b4 (3:59b4) +ItemUseSurfboard: ld a,[wWalkBikeSurfState] ld [wWalkBikeSurfStateCopy],a cp a,2 ; is the player already surfing? @@ -742,18 +742,18 @@ ItemUseSurfboard: ; d9b4 (3:59b4) ld [wSimulatedJoypadStatesIndex],a ret -SurfingGotOnText: ; da4c (3:5a4c) +SurfingGotOnText: TX_FAR _SurfingGotOnText db "@" -SurfingNoPlaceToGetOffText: ; da51 (3:5a51) +SurfingNoPlaceToGetOffText: TX_FAR _SurfingNoPlaceToGetOffText db "@" -ItemUsePokedex: ; da56 (3:5a56) +ItemUsePokedex: predef_jump ShowPokedexMenu -ItemUseEvoStone: ; da5b (3:5a5b) +ItemUseEvoStone: ld a,[wIsInBattle] and a jp nz,ItemUseNotTime @@ -794,12 +794,12 @@ ItemUseEvoStone: ; da5b (3:5a5b) pop af ret -ItemUseVitamin: ; dab4 (3:5ab4) +ItemUseVitamin: ld a,[wIsInBattle] and a jp nz,ItemUseNotTime -ItemUseMedicine: ; dabb (3:5abb) +ItemUseMedicine: ld a,[wPartyCount] and a jp z,.emptyParty @@ -1414,22 +1414,22 @@ ItemUseMedicine: ; dabb (3:5abb) ld [wWhichPokemon],a jp RemoveUsedItem -VitaminStatRoseText: ; df24 (3:5f24) +VitaminStatRoseText: TX_FAR _VitaminStatRoseText db "@" -VitaminNoEffectText: ; df29 (3:5f29) +VitaminNoEffectText: TX_FAR _VitaminNoEffectText db "@" -VitaminText: ; df2e (3:5f2e) +VitaminText: db "HEALTH@" db "ATTACK@" db "DEFENSE@" db "SPEED@" db "SPECIAL@" -ItemUseBait: ; df52 (3:5f52) +ItemUseBait: ld hl,ThrewBaitText call PrintText ld hl,wEnemyMonCatchRate ; catch rate @@ -1439,7 +1439,7 @@ ItemUseBait: ; df52 (3:5f52) ld de,wSafariEscapeFactor ; escape factor jr BaitRockCommon -ItemUseRock: ; df67 (3:5f67) +ItemUseRock: ld hl,ThrewRockText call PrintText ld hl,wEnemyMonCatchRate ; catch rate @@ -1453,7 +1453,7 @@ ItemUseRock: ; df67 (3:5f67) ld hl,wSafariEscapeFactor ; escape factor ld de,wSafariBaitFactor ; bait factor -BaitRockCommon: ; df7f (3:5f7f) +BaitRockCommon: ld [wAnimationID],a xor a ld [wAnimationType],a @@ -1476,16 +1476,16 @@ BaitRockCommon: ; df7f (3:5f7f) ld c,70 jp DelayFrames -ThrewBaitText: ; dfa5 (3:5fa5) +ThrewBaitText: TX_FAR _ThrewBaitText db "@" -ThrewRockText: ; dfaa (3:5faa) +ThrewRockText: TX_FAR _ThrewRockText db "@" ; also used for Dig out-of-battle effect -ItemUseEscapeRope: ; dfaf (3:5faf) +ItemUseEscapeRope: ld a,[wIsInBattle] and a jr nz,.notUsable @@ -1523,14 +1523,14 @@ ItemUseEscapeRope: ; dfaf (3:5faf) .notUsable jp ItemUseNotTime -EscapeRopeTilesets: ; dffd (3:5ffd) +EscapeRopeTilesets: db FOREST, CEMETERY, CAVERN, FACILITY, INTERIOR db $ff ; terminator -ItemUseRepel: ; e003 (3:6003) +ItemUseRepel: ld b,100 -ItemUseRepelCommon: ; e005 (3:6005) +ItemUseRepelCommon: ld a,[wIsInBattle] and a jp nz,ItemUseNotTime @@ -1539,7 +1539,7 @@ ItemUseRepelCommon: ; e005 (3:6005) jp PrintItemUseTextAndRemoveItem ; handles X Accuracy item -ItemUseXAccuracy: ; e013 (3:6013) +ItemUseXAccuracy: ld a,[wIsInBattle] and a jp z,ItemUseNotTime @@ -1549,7 +1549,7 @@ ItemUseXAccuracy: ; e013 (3:6013) ; This function is bugged and never works. It always jumps to ItemUseNotTime. ; The Card Key is handled in a different way. -ItemUseCardKey: ; e022 (3:6022) +ItemUseCardKey: xor a ld [wUnusedD71F],a call GetTileAndCoordsInFrontOfPlayer @@ -1609,7 +1609,7 @@ ItemUseCardKey: ; e022 (3:6022) ; 02: X ; 03: ID? -CardKeyTable1: ; e072 (3:6072) +CardKeyTable1: db SILPH_CO_2F,$04,$04,$00 db SILPH_CO_2F,$04,$05,$01 db SILPH_CO_4F,$0C,$04,$02 @@ -1622,7 +1622,7 @@ CardKeyTable1: ; e072 (3:6072) db SILPH_CO_10F,$08,$0B,$09 db $ff -CardKeyTable2: ; e09b (3:609b) +CardKeyTable2: db SILPH_CO_3F,$08,$09,$0A db SILPH_CO_3F,$09,$09,$0B db SILPH_CO_5F,$04,$07,$0C @@ -1635,12 +1635,12 @@ CardKeyTable2: ; e09b (3:609b) db SILPH_CO_9F,$09,$03,$13 db $ff -CardKeyTable3: ; e0c4 (3:60c4) +CardKeyTable3: db SILPH_CO_11F,$08,$09,$14 db SILPH_CO_11F,$09,$09,$15 db $ff -ItemUsePokedoll: ; e0cd (3:60cd) +ItemUsePokedoll: ld a,[wIsInBattle] dec a jp nz,ItemUseNotTime @@ -1648,7 +1648,7 @@ ItemUsePokedoll: ; e0cd (3:60cd) ld [wEscapedFromBattle],a jp PrintItemUseTextAndRemoveItem -ItemUseGuardSpec: ; e0dc (3:60dc) +ItemUseGuardSpec: ld a,[wIsInBattle] and a jp z,ItemUseNotTime @@ -1656,15 +1656,15 @@ ItemUseGuardSpec: ; e0dc (3:60dc) set ProtectedByMist,[hl] ; Mist bit jp PrintItemUseTextAndRemoveItem -ItemUseSuperRepel: ; e0eb (3:60eb) +ItemUseSuperRepel: ld b,200 jp ItemUseRepelCommon -ItemUseMaxRepel: ; e0f0 (3:60f0) +ItemUseMaxRepel: ld b,250 jp ItemUseRepelCommon -ItemUseDireHit: ; e0f5 (3:60f5) +ItemUseDireHit: ld a,[wIsInBattle] and a jp z,ItemUseNotTime @@ -1672,7 +1672,7 @@ ItemUseDireHit: ; e0f5 (3:60f5) set GettingPumped,[hl] ; Focus Energy bit jp PrintItemUseTextAndRemoveItem -ItemUseXStat: ; e104 (3:6104) +ItemUseXStat: ld a,[wIsInBattle] and a jr nz,.inBattle @@ -1705,7 +1705,7 @@ ItemUseXStat: ; e104 (3:6104) ld [hl],a ; restore [wPlayerMoveNum] ret -ItemUsePokeflute: ; e140 (3:6140) +ItemUsePokeflute: ld a,[wIsInBattle] and a jr nz,.inBattle @@ -1789,7 +1789,7 @@ ItemUsePokeflute: ; e140 (3:6140) ; [wWereAnyMonsAsleep] should be initialized to 0 ; OUTPUT: ; [wWereAnyMonsAsleep]: set to 1 if any pokemon were asleep -WakeUpEntireParty: ; e1e5 (3:61e5) +WakeUpEntireParty: ld de,44 ld c,6 .loop @@ -1811,7 +1811,7 @@ WakeUpEntireParty: ; e1e5 (3:61e5) ; Format: ; 00: Y ; 01: X -Route12SnorlaxFluteCoords: ; e1fd (3:61fd) +Route12SnorlaxFluteCoords: db 62,9 ; one space West of Snorlax db 61,10 ; one space North of Snorlax db 63,10 ; one space South of Snorlax @@ -1821,20 +1821,20 @@ Route12SnorlaxFluteCoords: ; e1fd (3:61fd) ; Format: ; 00: Y ; 01: X -Route16SnorlaxFluteCoords: ; e206 (3:6206) +Route16SnorlaxFluteCoords: db 10,27 ; one space East of Snorlax db 10,25 ; one space West of Snorlax db $ff ; terminator -PlayedFluteNoEffectText: ; e20b (3:620b) +PlayedFluteNoEffectText: TX_FAR _PlayedFluteNoEffectText db "@" -FluteWokeUpText: ; e210 (3:6210) +FluteWokeUpText: TX_FAR _FluteWokeUpText db "@" -PlayedFluteHadEffectText: ; e215 (3:6215) +PlayedFluteHadEffectText: TX_FAR _PlayedFluteHadEffectText db $06 TX_ASM @@ -1855,25 +1855,25 @@ PlayedFluteHadEffectText: ; e215 (3:6215) .done jp TextScriptEnd ; end text -ItemUseCoinCase: ; e23a (3:623a) +ItemUseCoinCase: ld a,[wIsInBattle] and a jp nz,ItemUseNotTime ld hl,CoinCaseNumCoinsText jp PrintText -CoinCaseNumCoinsText: ; e247 (3:6247) +CoinCaseNumCoinsText: TX_FAR _CoinCaseNumCoinsText db "@" -ItemUseOldRod: ; e24c (3:624c) +ItemUseOldRod: call FishingInit jp c, ItemUseNotTime lb bc, 5, MAGIKARP ld a, $1 ; set bite jr RodResponse -ItemUseGoodRod: ; e259 (3:6259) +ItemUseGoodRod: call FishingInit jp c,ItemUseNotTime .RandomLoop @@ -1901,12 +1901,12 @@ ItemUseGoodRod: ; e259 (3:6259) INCLUDE "data/good_rod.asm" -ItemUseSuperRod: ; e283 (3:6283) +ItemUseSuperRod: call FishingInit jp c, ItemUseNotTime call ReadSuperRodData ld a, e -RodResponse: ; e28d (3:628d) +RodResponse: ld [wRodResponse], a dec a ; is there a bite? @@ -1933,7 +1933,7 @@ RodResponse: ; e28d (3:628d) ; checks if fishing is possible and if so, runs initialization code common to all rods ; unsets carry if fishing is possible, sets carry if not -FishingInit: ; e2b4 (3:62b4) +FishingInit: ld a,[wIsInBattle] and a jr z,.notInBattle @@ -1958,10 +1958,10 @@ FishingInit: ; e2b4 (3:62b4) scf ; can't fish when surfing ret -ItemUseOaksParcel: ; e2de (3:62de) +ItemUseOaksParcel: jp ItemUseNotYoursToUse -ItemUseItemfinder: ; e2e1 (3:62e1) +ItemUseItemfinder: ld a,[wIsInBattle] and a jp nz,ItemUseNotTime @@ -1981,20 +1981,20 @@ ItemUseItemfinder: ; e2e1 (3:62e1) .printText jp PrintText -ItemfinderFoundItemText: ; e30d (3:630d) +ItemfinderFoundItemText: TX_FAR _ItemfinderFoundItemText db "@" -ItemfinderFoundNothingText: ; e312 (3:6312) +ItemfinderFoundNothingText: TX_FAR _ItemfinderFoundNothingText db "@" -ItemUsePPUp: ; e317 (3:6317) +ItemUsePPUp: ld a,[wIsInBattle] and a jp nz,ItemUseNotTime -ItemUsePPRestore: ; e31e (3:631e) +ItemUsePPRestore: ld a,[wWhichPokemon] push af ld a,[wcf91] @@ -2170,31 +2170,31 @@ ItemUsePPRestore: ; e31e (3:631e) ld [wActionResultOrTookBattleTurn],a ; item use failed ret -RaisePPWhichTechniqueText: ; e45d (3:645d) +RaisePPWhichTechniqueText: TX_FAR _RaisePPWhichTechniqueText db "@" -RestorePPWhichTechniqueText: ; e462 (3:6462) +RestorePPWhichTechniqueText: TX_FAR _RestorePPWhichTechniqueText db "@" -PPMaxedOutText: ; e467 (3:6467) +PPMaxedOutText: TX_FAR _PPMaxedOutText db "@" -PPIncreasedText: ; e46c (3:646c) +PPIncreasedText: TX_FAR _PPIncreasedText db "@" -PPRestoredText: ; e471 (3:6471) +PPRestoredText: TX_FAR _PPRestoredText db "@" ; for items that can't be used from the Item menu -UnusableItem: ; e476 (3:6476) +UnusableItem: jp ItemUseNotTime -ItemUseTMHM: ; e479 (3:6479) +ItemUseTMHM: ld a,[wIsInBattle] and a jp nz,ItemUseNotTime @@ -2291,48 +2291,48 @@ ItemUseTMHM: ; e479 (3:6479) ret c jp RemoveUsedItem -BootedUpTMText: ; e54f (3:654f) +BootedUpTMText: TX_FAR _BootedUpTMText db "@" -BootedUpHMText: ; e554 (3:6554) +BootedUpHMText: TX_FAR _BootedUpHMText db "@" -TeachMachineMoveText: ; e559 (3:6559) +TeachMachineMoveText: TX_FAR _TeachMachineMoveText db "@" -MonCannotLearnMachineMoveText: ; e55e (3:655e) +MonCannotLearnMachineMoveText: TX_FAR _MonCannotLearnMachineMoveText db "@" -PrintItemUseTextAndRemoveItem: ; e563 (3:6563) +PrintItemUseTextAndRemoveItem: ld hl,ItemUseText00 call PrintText ld a,SFX_HEAL_AILMENT call PlaySound call WaitForTextScrollButtonPress ; wait for button press -RemoveUsedItem: ; e571 (3:6571) +RemoveUsedItem: ld hl,wNumBagItems ld a,1 ; one item ld [wItemQuantity],a jp RemoveItemFromInventory -ItemUseNoEffect: ; e57c (3:657c) +ItemUseNoEffect: ld hl,ItemUseNoEffectText jr ItemUseFailed -ItemUseNotTime: ; e581 (3:6581) +ItemUseNotTime: ld hl,ItemUseNotTimeText jr ItemUseFailed -ItemUseNotYoursToUse: ; e586 (3:6586) +ItemUseNotYoursToUse: ld hl,ItemUseNotYoursToUseText jr ItemUseFailed -ThrowBallAtTrainerMon: ; e58b (3:658b) +ThrowBallAtTrainerMon: call RunDefaultPaletteCommand call LoadScreenTilesFromBuffer1 ; restore saved screen call Delay3 @@ -2345,67 +2345,67 @@ ThrowBallAtTrainerMon: ; e58b (3:658b) call PrintText jr RemoveUsedItem -NoCyclingAllowedHere: ; e5ac (3:65ac) +NoCyclingAllowedHere: ld hl,NoCyclingAllowedHereText jr ItemUseFailed -BoxFullCannotThrowBall: ; e5b1 (3:65b1) +BoxFullCannotThrowBall: ld hl,BoxFullCannotThrowBallText jr ItemUseFailed -SurfingAttemptFailed: ; e5b6 (3:65b6) +SurfingAttemptFailed: ld hl,NoSurfingHereText -ItemUseFailed: ; e5b9 (3:65b9) +ItemUseFailed: xor a ld [wActionResultOrTookBattleTurn],a ; item use failed jp PrintText -ItemUseNotTimeText: ; e5c0 (3:65c0) +ItemUseNotTimeText: TX_FAR _ItemUseNotTimeText db "@" -ItemUseNotYoursToUseText: ; e5c5 (3:65c5) +ItemUseNotYoursToUseText: TX_FAR _ItemUseNotYoursToUseText db "@" -ItemUseNoEffectText: ; e5ca (3:65ca) +ItemUseNoEffectText: TX_FAR _ItemUseNoEffectText db "@" -ThrowBallAtTrainerMonText1: ; e5cf (3:65cf) +ThrowBallAtTrainerMonText1: TX_FAR _ThrowBallAtTrainerMonText1 db "@" -ThrowBallAtTrainerMonText2: ; e5d4 (3:65d4) +ThrowBallAtTrainerMonText2: TX_FAR _ThrowBallAtTrainerMonText2 db "@" -NoCyclingAllowedHereText: ; e5d9 (3:65d9) +NoCyclingAllowedHereText: TX_FAR _NoCyclingAllowedHereText db "@" -NoSurfingHereText: ; e5de (3:65de) +NoSurfingHereText: TX_FAR _NoSurfingHereText db "@" -BoxFullCannotThrowBallText: ; e5e3 (3:65e3) +BoxFullCannotThrowBallText: TX_FAR _BoxFullCannotThrowBallText db "@" -ItemUseText00: ; e5e8 (3:65e8) +ItemUseText00: TX_FAR _ItemUseText001 db $05 TX_FAR _ItemUseText002 db "@" -GotOnBicycleText: ; e5f2 (3:65f2) +GotOnBicycleText: TX_FAR _GotOnBicycleText1 db $05 TX_FAR _GotOnBicycleText2 db "@" -GotOffBicycleText: ; e5fc (3:65fc) +GotOffBicycleText: TX_FAR _GotOffBicycleText1 db $05 TX_FAR _GotOffBicycleText2 @@ -2416,7 +2416,7 @@ GotOffBicycleText: ; e5fc (3:65fc) ; INPUT: ; [wWhichPokemon] = index of pokemon in party ; [wCurrentMenuItem] = index of move (when using a PP Up) -RestoreBonusPP: ; e606 (3:6606) +RestoreBonusPP: ld hl,wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 ld a,[wWhichPokemon] @@ -2458,7 +2458,7 @@ RestoreBonusPP: ; e606 (3:6606) ; INPUT: ; [de] = normal max PP ; [hl] = move PP -AddBonusPP: ; e642 (3:6642) +AddBonusPP: push bc ld a,[de] ; normal max PP of move ld [H_DIVIDEND + 3],a @@ -2507,7 +2507,7 @@ AddBonusPP: ; e642 (3:6642) ; [wCurrentMenuItem] = move index ; OUTPUT: ; [wMaxPP] = max PP -GetMaxPP: ; e677 (3:6677) +GetMaxPP: ld a,[wMonDataLocation] and a ld hl,wPartyMon1Moves @@ -2567,11 +2567,11 @@ GetMaxPP: ; e677 (3:6677) ld [wMaxPP],a ; store max PP ret -GetSelectedMoveOffset: ; e6e3 (3:66e3) +GetSelectedMoveOffset: ld a,[wWhichPokemon] call AddNTimes -GetSelectedMoveOffset2: ; e6e9 (3:66e9) +GetSelectedMoveOffset2: ld a,[wCurrentMenuItem] ld c,a ld b,0 @@ -2586,7 +2586,7 @@ GetSelectedMoveOffset2: ; e6e9 (3:66e9) ; [wItemQuantity] = quantity to toss ; OUTPUT: ; clears carry flag if the item is tossed, sets carry flag if not -TossItem_: ; e6f1 (3:66f1) +TossItem_: push hl ld a,[wcf91] call IsItemHM @@ -2636,15 +2636,15 @@ TossItem_: ; e6f1 (3:66f1) scf ret -ThrewAwayItemText: ; e755 (3:6755) +ThrewAwayItemText: TX_FAR _ThrewAwayItemText db "@" -IsItOKToTossItemText: ; e75a (3:675a) +IsItOKToTossItemText: TX_FAR _IsItOKToTossItemText db "@" -TooImportantToTossText: ; e75f (3:675f) +TooImportantToTossText: TX_FAR _TooImportantToTossText db "@" @@ -2655,7 +2655,7 @@ TooImportantToTossText: ; e75f (3:675f) ; [wIsKeyItem] = result ; 00: item is not key item ; 01: item is key item -IsKeyItem_: ; e764 (3:6764) +IsKeyItem_: ld a,$01 ld [wIsKeyItem],a ld a,[wcf91] @@ -2686,7 +2686,7 @@ IsKeyItem_: ; e764 (3:6764) INCLUDE "data/key_items.asm" -SendNewMonToBox: ; e7a4 (3:67a4) +SendNewMonToBox: ld de, wNumInBox ld a, [de] inc a @@ -2855,7 +2855,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ; checks if the tile in front of the player is a shore or water tile ; used for surfing and fishing ; unsets carry if it is, sets carry if not -IsNextTileShoreOrWater: ; e8b8 (3:68b8) +IsNextTileShoreOrWater: ld a, [wCurMapTileset] ld hl, WaterTilesets ld de,1 @@ -2880,11 +2880,11 @@ IsNextTileShoreOrWater: ; e8b8 (3:68b8) ret ; tilesets with water -WaterTilesets: ; e8e0 (3:68e0) +WaterTilesets: db OVERWORLD, FOREST, DOJO, GYM, SHIP, SHIP_PORT, CAVERN, FACILITY, PLATEAU db $ff ; terminator -ReadSuperRodData: ; e8ea (3:68ea) +ReadSuperRodData: ; return e = 2 if no fish on this map ; return e = 1 if a bite, bc = level,species ; return e = 0 if no bite @@ -2933,13 +2933,13 @@ INCLUDE "data/super_rod.asm" ; reloads map view and processes sprite data ; for items that cause the overworld to be displayed -ItemUseReloadOverworldData: ; e9c5 (3:69c5) +ItemUseReloadOverworldData: call LoadCurrentMapView jp UpdateSprites ; creates a list at wBuffer of maps where the mon in [wd11e] can be found. ; this is used by the pokedex to display locations the mon can be found on the map. -FindWildLocationsOfMon: ; e9cb (3:69cb) +FindWildLocationsOfMon: ld hl, WildDataPointers ld de, wBuffer ld c, $0 @@ -2968,7 +2968,7 @@ FindWildLocationsOfMon: ; e9cb (3:69cb) ld [de], a ret -CheckMapForMon: ; e9f0 (3:69f0) +CheckMapForMon: inc hl ld b, $a .loop diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm index 6bb7f711..80e6bf3c 100755 --- a/engine/items/tm_prices.asm +++ b/engine/items/tm_prices.asm @@ -1,4 +1,4 @@ -GetMachinePrice: ; 7bf86 (1e:7f86) +GetMachinePrice: ; Input: [wcf91] = Item Id of a TM ; Output: Stores the TM price at hItemPrice ld a, [wcf91] ; a contains TM item id diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 0fcc5710..7ccaa232 100755 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -1,5 +1,5 @@ ; checks if the mon in [wWhichPokemon] already knows the move in [wMoveNum] -CheckIfMoveIsKnown: ; 2fe18 (b:7e18) +CheckIfMoveIsKnown: ld a, [wWhichPokemon] ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 @@ -21,6 +21,6 @@ CheckIfMoveIsKnown: ; 2fe18 (b:7e18) scf ret -AlreadyKnowsText: ; 2fe3b (b:7e3b) +AlreadyKnowsText: TX_FAR _AlreadyKnowsText db "@" diff --git a/engine/items/tms.asm b/engine/items/tms.asm index 7d00f7f3..da1b5e72 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -1,5 +1,5 @@ ; tests if mon [wcf91] can learn move [wMoveNum] -CanLearnTM: ; 1373e (4:773e) +CanLearnTM: ld a, [wcf91] ld [wd0b5], a call GetMonHeader @@ -22,7 +22,7 @@ CanLearnTM: ; 1373e (4:773e) ; converts TM/HM number in wd11e into move number ; HMs start at 51 -TMToMove: ; 13763 (4:7763) +TMToMove: ld a, [wd11e] dec a ld hl, TechnicalMachines diff --git a/engine/learn_move.asm b/engine/learn_move.asm index ede8a542..5fa6df08 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -1,4 +1,4 @@ -LearnMove: ; 6e43 (1:6e43) +LearnMove: call SaveScreenTilesToBuffer1 ld a, [wWhichPokemon] ld hl, wPartyMonNicks @@ -8,7 +8,7 @@ LearnMove: ; 6e43 (1:6e43) ld bc, NAME_LENGTH call CopyData -DontAbandonLearning: ; 6e5b (1:6e5b) +DontAbandonLearning: ld hl, wPartyMon1Moves ld bc, wPartyMon2Moves - wPartyMon1Moves ld a, [wWhichPokemon] @@ -73,7 +73,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b) call CopyData jp PrintLearnedMove -AbandonLearning: ; 6eda (1:6eda) +AbandonLearning: ld hl, AbandonLearningText call PrintText coord hl, 14, 7 @@ -89,13 +89,13 @@ AbandonLearning: ; 6eda (1:6eda) ld b, 0 ret -PrintLearnedMove: ; 6efe (1:6efe) +PrintLearnedMove: ld hl, LearnedMove1Text call PrintText ld b, 1 ret -TryingToLearn: ; 6f07 (1:6f07) +TryingToLearn: push hl ld hl, TryingToLearnText call PrintText @@ -183,27 +183,27 @@ TryingToLearn: ; 6f07 (1:6f07) scf ret -LearnedMove1Text: ; 6fb4 (1:6fb4) +LearnedMove1Text: TX_FAR _LearnedMove1Text db $b,6,"@" -WhichMoveToForgetText: ; 6fb4 (1:6fb4) +WhichMoveToForgetText: TX_FAR _WhichMoveToForgetText db "@" -AbandonLearningText: ; 6fb9 (1:6fb9) +AbandonLearningText: TX_FAR _AbandonLearningText db "@" -DidNotLearnText: ; 6fbe (1:6fbe) +DidNotLearnText: TX_FAR _DidNotLearnText db "@" -TryingToLearnText: ; 6fc3 (1:6fc3) +TryingToLearnText: TX_FAR _TryingToLearnText db "@" -OneTwoAndText: ; 6fc8 (1:6fc8) +OneTwoAndText: TX_FAR _OneTwoAndText db $a TX_ASM @@ -212,13 +212,13 @@ OneTwoAndText: ; 6fc8 (1:6fc8) ld hl, PoofText ret -PoofText: ; 6fd7 (1:6fd7) +PoofText: TX_FAR _PoofText db $a -ForgotAndText: ; 6fdc (1:6fdc) +ForgotAndText: TX_FAR _ForgotAndText db "@" -HMCantDeleteText: ; 6fe1 (1:6fe1) +HMCantDeleteText: TX_FAR _HMCantDeleteText db "@" diff --git a/engine/load_pokedex_tiles.asm b/engine/load_pokedex_tiles.asm index 1189d2f0..637b7a24 100755 --- a/engine/load_pokedex_tiles.asm +++ b/engine/load_pokedex_tiles.asm @@ -1,5 +1,5 @@ ; Loads tile patterns for tiles used in the pokedex. -LoadPokedexTilePatterns: ; 17840 (5:7840) +LoadPokedexTilePatterns: call LoadHpBarAndStatusTilePatterns ld de,PokedexTileGraphics ld hl,vChars2 + $600 diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 0be2e6b0..384ab485 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -1,4 +1,4 @@ -DisplayPCMainMenu:: ; 213c8 (8:53c8) +DisplayPCMainMenu:: xor a ld [H_AUTOBGTRANSFERENABLED], a call SaveScreenTilesToBuffer2 @@ -111,7 +111,7 @@ BillsPC_:: ; 0x214c2 ld hl, SwitchOnText call PrintText -BillsPCMenu: ; 214e8 (8:54e8) +BillsPCMenu: ld a, [wParentMenuItem] ld [wCurrentMenuItem], a ld hl, vChars2 + $780 @@ -185,7 +185,7 @@ BillsPCMenu: ; 214e8 (8:54e8) cp $3 jp z, BillsPCChangeBox ; change box -ExitBillsPC: ; 21588 (8:5588) +ExitBillsPC: ld a, [wFlags_0xcd60] bit 3, a ; accessing Bill's PC through another PC? jr nz, .next @@ -204,7 +204,7 @@ ExitBillsPC: ; 21588 (8:5588) res 6, [hl] ret -BillsPCDeposit: ; 215ac (8:55ac) +BillsPCDeposit: ld a, [wPartyCount] dec a jr nz, .partyLargeEnough @@ -253,7 +253,7 @@ BillsPCDeposit: ; 215ac (8:55ac) call PrintText jp BillsPCMenu -BillsPCWithdraw: ; 21618 (8:5618) +BillsPCWithdraw: ld a, [wNumInBox] and a jr nz, .boxNotEmpty @@ -290,7 +290,7 @@ BillsPCWithdraw: ; 21618 (8:5618) call PrintText jp BillsPCMenu -BillsPCRelease: ; 21673 (8:5673) +BillsPCRelease: ld a, [wNumInBox] and a jr nz, .loop @@ -317,11 +317,11 @@ BillsPCRelease: ; 21673 (8:5673) call PrintText jp BillsPCMenu -BillsPCChangeBox: ; 216b3 (8:56b3) +BillsPCChangeBox: callba ChangeBox jp BillsPCMenu -DisplayMonListMenu: ; 216be (8:56be) +DisplayMonListMenu: ld a, l ld [wListPointer], a ld a, h @@ -338,7 +338,7 @@ DisplayMonListMenu: ; 216be (8:56be) ld [wPartyAndBillsPCSavedMenuItem], a ret -BillsPCMenuText: ; 216e1 (8:56e1) +BillsPCMenuText: db "WITHDRAW ", $4a next "DEPOSIT ", $4a next "RELEASE ", $4a @@ -346,10 +346,10 @@ BillsPCMenuText: ; 216e1 (8:56e1) next "SEE YA!" db "@" -BoxNoPCText: ; 21713 (8:5713) +BoxNoPCText: db "BOX No.@" -KnowsHMMove:: ; 2171b (8:571b) +KnowsHMMove:: ; returns whether mon with party index [wWhichPokemon] knows an HM move ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 @@ -376,7 +376,7 @@ KnowsHMMove:: ; 2171b (8:571b) and a ret -HMMoveArray: ; 21745 (8:5745) +HMMoveArray: db CUT db FLY db SURF @@ -384,7 +384,7 @@ HMMoveArray: ; 21745 (8:5745) db FLASH db -1 -DisplayDepositWithdrawMenu: ; 2174b (8:574b) +DisplayDepositWithdrawMenu: coord hl, 9, 10 ld b, 6 ld c, 9 @@ -505,7 +505,7 @@ MonWasReleasedText: ; 0x21820 TX_FAR _MonWasReleasedText db "@" -CableClubLeftGameboy:: ; 5824 (8:5825) +CableClubLeftGameboy:: ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK ret z @@ -522,7 +522,7 @@ CableClubLeftGameboy:: ; 5824 (8:5825) call EnableAutoTextBoxDrawing tx_pre_jump JustAMomentText -CableClubRightGameboy:: ; 5845 (8:5845) +CableClubRightGameboy:: ld a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK ret z @@ -539,7 +539,7 @@ CableClubRightGameboy:: ; 5845 (8:5845) call EnableAutoTextBoxDrawing tx_pre_jump JustAMomentText -JustAMomentText:: ; 21865 (8:5865) +JustAMomentText:: TX_FAR _JustAMomentText db "@" @@ -549,6 +549,6 @@ JustAMomentText:: ; 21865 (8:5865) call EnableAutoTextBoxDrawing tx_pre_jump OpenBillsPCText -OpenBillsPCText:: ; 21878 (8:5878) +OpenBillsPCText:: db $FD ; FuncTX_BillsPC diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 630c6c23..09ba123e 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -1,4 +1,4 @@ -DisplayDiploma: ; 566e2 (15:66e2) +DisplayDiploma: call SaveScreenTilesToBuffer2 call GBPalWhiteOutWithDelay3 call ClearScreen @@ -69,7 +69,7 @@ DisplayDiploma: ; 566e2 (15:66e2) call Delay3 jp GBPalNormal -UnusedPlayerNameLengthFunc: ; 56777 (15:6777) +UnusedPlayerNameLengthFunc: ; Unused function that does a calculation involving the length of the player's ; name. ld hl, wPlayerName @@ -81,7 +81,7 @@ UnusedPlayerNameLengthFunc: ; 56777 (15:6777) dec c jr .loop -DiplomaTextPointersAndCoords: ; 56784 (15:6784) +DiplomaTextPointersAndCoords: dw DiplomaText dwCoord 5, 2 dw DiplomaPlayer diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 7c31d346..e1359063 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -50,7 +50,7 @@ PKMNLeaguePC: ; 0x7657e call RunDefaultPaletteCommand jp GBPalNormal -LeaguePCShowTeam: ; 765e5 (1d:65e5) +LeaguePCShowTeam: ld c, PARTY_LENGTH .loop push bc @@ -77,7 +77,7 @@ LeaguePCShowTeam: ; 765e5 (1d:65e5) scf ret -LeaguePCShowMon: ; 76610 (1d:6610) +LeaguePCShowMon: call GBPalWhiteOutWithDelay3 call ClearScreen ld hl, wHallOfFame @@ -112,9 +112,9 @@ LeaguePCShowMon: ; 76610 (1d:6610) call PrintNumber jpba HoFDisplayMonInfo -HallOfFameNoText: ; 76670 (1d:6670) +HallOfFameNoText: db "HALL OF FAME No @" -AccessedHoFPCText: ; 76683 (1d:6683) +AccessedHoFPCText: TX_FAR _AccessedHoFPCText db "@" diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 75458c5e..d3152e4e 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -1,4 +1,4 @@ -MainMenu: ; 5af2 (1:5af2) +MainMenu: ; Check save file call InitOptions xor a @@ -124,14 +124,14 @@ MainMenu: ; 5af2 (1:5af2) call SpecialWarpIn jp SpecialEnterMap -InitOptions: ; 5bff (1:5bff) +InitOptions: ld a,1 ; no delay ld [wLetterPrintingDelayFlags],a ld a,3 ; medium speed ld [wOptions],a ret -LinkMenu: ; 5c0a (1:5c0a) +LinkMenu: xor a ld [wLetterPrintingDelayFlags], a ld hl, wd72e @@ -292,19 +292,19 @@ LinkMenu: ; 5c0a (1:5c0a) res 6, [hl] ret -WhereWouldYouLikeText: ; 5d43 (1:5d43) +WhereWouldYouLikeText: TX_FAR _WhereWouldYouLikeText db "@" -PleaseWaitText: ; 5d48 (1:5d48) +PleaseWaitText: TX_FAR _PleaseWaitText db "@" -LinkCanceledText: ; 5d4d (1:5d4d) +LinkCanceledText: TX_FAR _LinkCanceledText db "@" -StartNewGame: ; 5d52 (1:5d52) +StartNewGame: ld hl, wd732 res 1, [hl] call OakSpeech @@ -312,7 +312,7 @@ StartNewGame: ; 5d52 (1:5d52) call DelayFrames ; enter map after using a special warp or loading the game from the main menu -SpecialEnterMap: ; 5d5f (1:5d5f) +SpecialEnterMap: xor a ld [hJoyPressed], a ld [hJoyHeld], a @@ -328,19 +328,19 @@ SpecialEnterMap: ; 5d5f (1:5d5f) ret nz jp EnterMap -ContinueText: ; 5d7e (1:5d7e) +ContinueText: db "CONTINUE", $4e -NewGameText: ; 5d87 (1:5d87) +NewGameText: db "NEW GAME", $4e db "OPTION@" -CableClubOptionsText: ; 5d97 (1:5d97) +CableClubOptionsText: db "TRADE CENTER", $4e db "COLOSSEUM", $4e db "CANCEL@" -DisplayContinueGameInfo: ; 5db5 (1:5db5) +DisplayContinueGameInfo: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 4, 7 @@ -364,7 +364,7 @@ DisplayContinueGameInfo: ; 5db5 (1:5db5) ld c, 30 jp DelayFrames -PrintSaveScreenText: ; 5def (1:5def) +PrintSaveScreenText: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 4, 0 @@ -390,7 +390,7 @@ PrintSaveScreenText: ; 5def (1:5def) ld c, 30 jp DelayFrames -PrintNumBadges: ; 5e2f (1:5e2f) +PrintNumBadges: push hl ld hl, wObtainedBadges ld b, $1 @@ -400,7 +400,7 @@ PrintNumBadges: ; 5e2f (1:5e2f) lb bc, 1, 2 jp PrintNumber -PrintNumOwnedMons: ; 5e42 (1:5e42) +PrintNumOwnedMons: push hl ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned @@ -410,7 +410,7 @@ PrintNumOwnedMons: ; 5e42 (1:5e42) lb bc, 1, 3 jp PrintNumber -PrintPlayTime: ; 5e55 (1:5e55) +PrintPlayTime: ld de, wPlayTimeHours lb bc, 1, 3 call PrintNumber @@ -420,13 +420,13 @@ PrintPlayTime: ; 5e55 (1:5e55) lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber -SaveScreenInfoText: ; 5e6a (1:5e6a) +SaveScreenInfoText: db "PLAYER" next "BADGES " next "#DEX " next "TIME@" -DisplayOptionMenu: ; 5e8a (1:5e8a) +DisplayOptionMenu: coord hl, 0, 0 ld b,3 ld c,18 @@ -578,23 +578,23 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) ld [wOptionsTextSpeedCursorX],a ; text speed cursor X coordinate jp .eraseOldMenuCursor -TextSpeedOptionText: ; 5fc0 (1:5fc0) +TextSpeedOptionText: db "TEXT SPEED" next " FAST MEDIUM SLOW@" -BattleAnimationOptionText: ; 5fde (1:5fde) +BattleAnimationOptionText: db "BATTLE ANIMATION" next " ON OFF@" -BattleStyleOptionText: ; 5ffd (1:5ffd) +BattleStyleOptionText: db "BATTLE STYLE" next " SHIFT SET@" -OptionMenuCancelText: ; 6018 (1:6018) +OptionMenuCancelText: db "CANCEL@" ; sets the options variable according to the current placement of the menu cursors in the options menu -SetOptionsFromCursorPositions: ; 601f (1:601f) +SetOptionsFromCursorPositions: ld hl,TextSpeedOptionData ld a,[wOptionsTextSpeedCursorX] ; text speed cursor X coordinate ld c,a @@ -630,7 +630,7 @@ SetOptionsFromCursorPositions: ; 601f (1:601f) ret ; reads the options variable and places menu cursors in the correct positions within the options menu -SetCursorPositionsFromOptions: ; 604c (1:604c) +SetCursorPositionsFromOptions: ld hl,TextSpeedOptionData + 1 ld a,[wOptions] ld c,a @@ -674,14 +674,14 @@ SetCursorPositionsFromOptions: ; 604c (1:604c) ; Format: ; 00: X coordinate of menu cursor ; 01: delay after printing a letter (in frames) -TextSpeedOptionData: ; 6096 (1:6096) +TextSpeedOptionData: db 14,5 ; Slow db 7,3 ; Medium db 1,1 ; Fast db 7 ; default X coordinate (Medium) db $ff ; terminator -CheckForPlayerNameInSRAM: ; 609e (1:609e) +CheckForPlayerNameInSRAM: ; Check if the player name data in SRAM has a string terminator character ; (indicating that a name may have been saved there) and return whether it does ; in carry. diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 41f63095..759be189 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -1,4 +1,4 @@ -AskName: ; 64eb (1:64eb) +AskName: call SaveScreenTilesToBuffer1 call GetPredefRegisters push hl @@ -53,7 +53,7 @@ DoYouWantToNicknameText: ; 0x6557 TX_FAR _DoYouWantToNicknameText db "@" -DisplayNameRaterScreen: ; 655c (1:655c) +DisplayNameRaterScreen: ld hl, wBuffer xor a ld [wUpdateSpritesEnabled], a @@ -81,7 +81,7 @@ DisplayNameRaterScreen: ; 655c (1:655c) scf ret -DisplayNamingScreen: ; 6596 (1:6596) +DisplayNamingScreen: push hl ld hl, wd730 set 6, [hl] @@ -323,7 +323,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld [wTopMenuItemX], a jp EraseMenuCursor -LoadEDTile: ; 675b (1:675b) +LoadEDTile: ld de, ED_Tile ld hl, vFont + $700 ld bc, (ED_TileEnd - ED_Tile) / $8 @@ -331,11 +331,11 @@ LoadEDTile: ; 675b (1:675b) ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8 jp CopyVideoDataDouble -ED_Tile: ; 6767 (1:6767) +ED_Tile: INCBIN "gfx/ED_tile.1bpp" ED_TileEnd: -PrintAlphabet: ; 676f (1:676f) +PrintAlphabet: xor a ld [H_AUTOBGTRANSFERENABLED], a ld a, [wAlphabetCase] @@ -365,13 +365,13 @@ PrintAlphabet: ; 676f (1:676f) ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -LowerCaseAlphabet: ; 679e (1:679e) +LowerCaseAlphabet: db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥UPPER CASE@" -UpperCaseAlphabet: ; 67d6 (1:67d6) +UpperCaseAlphabet: db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥lower case@" -PrintNicknameAndUnderscores: ; 680e (1:680e) +PrintNicknameAndUnderscores: call CalcStringLength ld a, c ld [wNamingScreenNameLength], a @@ -425,7 +425,7 @@ PrintNicknameAndUnderscores: ; 680e (1:680e) ld [hl], $77 ; raised underscore tile id ret -DakutensAndHandakutens: ; 6871 (1:6871) +DakutensAndHandakutens: push de call CalcStringLength dec hl @@ -439,7 +439,7 @@ DakutensAndHandakutens: ; 6871 (1:6871) ld [wNamingScreenLetter], a ret -Dakutens: ; 6885 (1:6885) +Dakutens: db "かが", "きぎ", "くぐ", "けげ", "こご" db "さざ", "しじ", "すず", "せぜ", "そぞ" db "ただ", "ちぢ", "つづ", "てで", "とど" @@ -450,13 +450,13 @@ Dakutens: ; 6885 (1:6885) db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" db $ff -Handakutens: ; 68d6 (1:68d6) +Handakutens: db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" db $ff ; calculates the length of the string at wcf4b and stores it in c -CalcStringLength: ; 68eb (1:68eb) +CalcStringLength: ld hl, wcf4b ld c, $0 .loop @@ -467,7 +467,7 @@ CalcStringLength: ; 68eb (1:68eb) inc c jr .loop -PrintNamingText: ; 68f8 (1:68f8) +PrintNamingText: coord hl, 0, 1 ld a, [wNamingScreenType] ld de, YourTextString @@ -499,14 +499,14 @@ PrintNamingText: ; 68f8 (1:68f8) .placeString jp PlaceString -YourTextString: ; 693f (1:693f) +YourTextString: db "YOUR @" -RivalsTextString: ; 6945 (1:6945) +RivalsTextString: db "RIVAL's @" -NameTextString: ; 694d (1:694d) +NameTextString: db "NAME?@" -NicknameTextString: ; 6953 (1:6953) +NicknameTextString: db "NICKNAME?@" diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm index 7ff03c46..55852b63 100755 --- a/engine/menu/oaks_pc.asm +++ b/engine/menu/oaks_pc.asm @@ -1,4 +1,4 @@ -OpenOaksPC: ; 1e915 (7:6915) +OpenOaksPC: call SaveScreenTilesToBuffer2 ld hl, AccessedOaksPCText call PrintText @@ -14,14 +14,14 @@ OpenOaksPC: ; 1e915 (7:6915) call PrintText jp LoadScreenTilesFromBuffer2 -GetDexRatedText: ; 1e93b (7:693b) +GetDexRatedText: TX_FAR _GetDexRatedText db "@" -ClosedOaksPCText: ; 1e940 (7:6940) +ClosedOaksPCText: TX_FAR _ClosedOaksPCText db $0d,"@" -AccessedOaksPCText: ; 1e946 (7:6946) +AccessedOaksPCText: TX_FAR _AccessedOaksPCText db "@" diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index f3e1a138..7ef14232 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -17,14 +17,14 @@ ; f6: health returned ; f7: revitalized ; f8: leveled up -DrawPartyMenu_: ; 12cd2 (4:6cd2) +DrawPartyMenu_: xor a ld [H_AUTOBGTRANSFERENABLED],a call ClearScreen call UpdateSprites callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics -RedrawPartyMenu_: ; 12ce3 (4:6ce3) +RedrawPartyMenu_: ld a,[wPartyMenuTypeOrMessageID] cp a,SWAP_MONS_PARTY_MENU jp z,.printMessage @@ -234,7 +234,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) call PrintText jr .done -PartyMenuItemUseMessagePointers: ; 12e61 (4:6e61) +PartyMenuItemUseMessagePointers: dw AntidoteText dw BurnHealText dw IceHealText @@ -245,7 +245,7 @@ PartyMenuItemUseMessagePointers: ; 12e61 (4:6e61) dw ReviveText dw RareCandyText -PartyMenuMessagePointers: ; 12e73 (4:6e73) +PartyMenuMessagePointers: dw PartyMenuNormalText dw PartyMenuItemUseText dw PartyMenuBattleText @@ -253,65 +253,65 @@ PartyMenuMessagePointers: ; 12e73 (4:6e73) dw PartyMenuSwapMonText dw PartyMenuItemUseText -PartyMenuNormalText: ; 12e7f (4:6e7f) +PartyMenuNormalText: TX_FAR _PartyMenuNormalText db "@" -PartyMenuItemUseText: ; 12e84 (4:6e84) +PartyMenuItemUseText: TX_FAR _PartyMenuItemUseText db "@" -PartyMenuBattleText: ; 12e89 (4:6e89) +PartyMenuBattleText: TX_FAR _PartyMenuBattleText db "@" -PartyMenuUseTMText: ; 12e8e (4:6e8e) +PartyMenuUseTMText: TX_FAR _PartyMenuUseTMText db "@" -PartyMenuSwapMonText: ; 12e93 (4:6e93) +PartyMenuSwapMonText: TX_FAR _PartyMenuSwapMonText db "@" -PotionText: ; 12e98 (4:6e98) +PotionText: TX_FAR _PotionText db "@" -AntidoteText: ; 12e9d (4:6e9d) +AntidoteText: TX_FAR _AntidoteText db "@" -ParlyzHealText: ; 12ea2 (4:6ea2) +ParlyzHealText: TX_FAR _ParlyzHealText db "@" -BurnHealText: ; 12ea7 (4:6ea7) +BurnHealText: TX_FAR _BurnHealText db "@" -IceHealText: ; 12eac (4:6eac) +IceHealText: TX_FAR _IceHealText db "@" -AwakeningText: ; 12eb1 (4:6eb1) +AwakeningText: TX_FAR _AwakeningText db "@" -FullHealText: ; 12eb6 (4:6eb6) +FullHealText: TX_FAR _FullHealText db "@" -ReviveText: ; 12ebb (4:6ebb) +ReviveText: TX_FAR _ReviveText db "@" -RareCandyText: ; 12ec0 (4:6ec0) +RareCandyText: TX_FAR _RareCandyText db $0B db $06 db "@" -SetPartyMenuHPBarColor: ; 12ec7 (4:6ec7) +SetPartyMenuHPBarColor: ld hl, wPartyMenuHPBarColors ld a, [wWhichPartyMenuHPBar] ld c, a diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm index 78b35b95..8ec31226 100755 --- a/engine/menu/pc.asm +++ b/engine/menu/pc.asm @@ -1,4 +1,4 @@ -ActivatePC: ; 17e2c (5:7e2c) +ActivatePC: call SaveScreenTilesToBuffer2 ld a, SFX_TURN_ON_PC call PlaySound @@ -9,7 +9,7 @@ ActivatePC: ; 17e2c (5:7e2c) set 3, [hl] call LoadScreenTilesFromBuffer2 call Delay3 -PCMainMenu: ; 17e48 (5:7e48) +PCMainMenu: callba DisplayPCMainMenu ld hl, wFlags_0xcd60 set 5, [hl] @@ -58,19 +58,19 @@ PCMainMenu: ; 17e48 (5:7e48) call PrintText callba PlayerPC jr ReloadMainMenu -OaksPC: ; 17ec0 (5:7ec0) +OaksPC: ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish callba OpenOaksPC jr ReloadMainMenu -PKMNLeague: ; 17ed2 (5:7ed2) +PKMNLeague: ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish callba PKMNLeaguePC jr ReloadMainMenu -BillsPC: ; 17ee4 (5:7ee4) +BillsPC: ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish @@ -83,13 +83,13 @@ BillsPC: ; 17ee4 (5:7ee4) .printText call PrintText callba BillsPC_ -ReloadMainMenu: ; 17f06 (5:7f06) +ReloadMainMenu: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a call ReloadMapData call UpdateSprites jp PCMainMenu -LogOff: ; 17f13 (5:7f13) +LogOff: ld a, SFX_TURN_OFF_PC call PlaySound call WaitForSoundToFinish @@ -98,24 +98,24 @@ LogOff: ; 17f13 (5:7f13) res 5, [hl] ret -TurnedOnPC1Text: ; 17f23 (5:7f23) +TurnedOnPC1Text: TX_FAR _TurnedOnPC1Text db "@" -AccessedBillsPCText: ; 17f28 (5:7f28) +AccessedBillsPCText: TX_FAR _AccessedBillsPCText db "@" -AccessedSomeonesPCText: ; 17f2d (5:7f2d) +AccessedSomeonesPCText: TX_FAR _AccessedSomeonesPCText db "@" -AccessedMyPCText: ; 17f32 (5:7f32) +AccessedMyPCText: TX_FAR _AccessedMyPCText db "@" ; removes one of the specified item ID [hItemToRemoveID] from bag (if existent) -RemoveItemByID: ; 17f37 (5:7f37) +RemoveItemByID: ld hl, wBagItems ld a, [hItemToRemoveID] ld b, a diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index 00889e93..bc2be4ef 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -1,4 +1,4 @@ -PlayerPC: ; 78e6 (1:78e6) +PlayerPC: ld hl, wd730 set 6, [hl] ld a, ITEM_NAME @@ -16,7 +16,7 @@ PlayerPC: ; 78e6 (1:78e6) ld hl, TurnedOnPC2Text call PrintText -PlayerPCMenu: ; 790c (1:790c) +PlayerPCMenu: ld a, [wParentMenuItem] ld [wCurrentMenuItem], a ld hl, wFlags_0xcd60 @@ -62,7 +62,7 @@ PlayerPCMenu: ; 790c (1:790c) dec a jp z, PlayerPCToss -ExitPlayerPC: ; 796d (1:796d) +ExitPlayerPC: ld a, [wFlags_0xcd60] bit 3, a ; accessing player's PC through another PC? jr nz, .next @@ -83,7 +83,7 @@ ExitPlayerPC: ; 796d (1:796d) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -PlayerPCDeposit: ; 7995 (1:7995) +PlayerPCDeposit: xor a ld [wCurrentMenuItem], a ld [wListScrollOffset], a @@ -137,7 +137,7 @@ PlayerPCDeposit: ; 7995 (1:7995) call PrintText jp .loop -PlayerPCWithdraw: ; 7a12 (1:7a12) +PlayerPCWithdraw: xor a ld [wCurrentMenuItem], a ld [wListScrollOffset], a @@ -191,7 +191,7 @@ PlayerPCWithdraw: ; 7a12 (1:7a12) call PrintText jp .loop -PlayerPCToss: ; 7a8f (1:7a8f) +PlayerPCToss: xor a ld [wCurrentMenuItem], a ld [wListScrollOffset], a @@ -240,64 +240,64 @@ PlayerPCToss: ; 7a8f (1:7a8f) call TossItem ; disallows tossing key items jp .loop -PlayersPCMenuEntries: ; 7af5 (1:7af5) +PlayersPCMenuEntries: db "WITHDRAW ITEM" next "DEPOSIT ITEM" next "TOSS ITEM" next "LOG OFF@" -TurnedOnPC2Text: ; 7b22 (1:7b22) +TurnedOnPC2Text: TX_FAR _TurnedOnPC2Text db "@" -WhatDoYouWantText: ; 7b27 (1:7b27) +WhatDoYouWantText: TX_FAR _WhatDoYouWantText db "@" -WhatToDepositText: ; 7b2c (1:7b2c) +WhatToDepositText: TX_FAR _WhatToDepositText db "@" -DepositHowManyText: ; 7b31 (1:7b31) +DepositHowManyText: TX_FAR _DepositHowManyText db "@" -ItemWasStoredText: ; 7b36 (1:7b36) +ItemWasStoredText: TX_FAR _ItemWasStoredText db "@" -NothingToDepositText: ; 7b3b (1:7b3b) +NothingToDepositText: TX_FAR _NothingToDepositText db "@" -NoRoomToStoreText: ; 7b40 (1:7b40) +NoRoomToStoreText: TX_FAR _NoRoomToStoreText db "@" -WhatToWithdrawText: ; 7b45 (1:7b45) +WhatToWithdrawText: TX_FAR _WhatToWithdrawText db "@" -WithdrawHowManyText: ; 7b4a (1:7b4a) +WithdrawHowManyText: TX_FAR _WithdrawHowManyText db "@" -WithdrewItemText: ; 7b4f (1:7b4f) +WithdrewItemText: TX_FAR _WithdrewItemText db "@" -NothingStoredText: ; 7b54 (1:7b54) +NothingStoredText: TX_FAR _NothingStoredText db "@" -CantCarryMoreText: ; 7b59 (1:7b59) +CantCarryMoreText: TX_FAR _CantCarryMoreText db "@" -WhatToTossText: ; 7b5e (1:7b5e) +WhatToTossText: TX_FAR _WhatToTossText db "@" -TossHowManyText: ; 7b63 (1:7b63) +TossHowManyText: TX_FAR _TossHowManyText db "@" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 3898ef43..3078f1a9 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -1,4 +1,4 @@ -ShowPokedexMenu: ; 40000 (10:4000) +ShowPokedexMenu: call GBPalWhiteOut call ClearScreen call UpdateSprites @@ -57,7 +57,7 @@ ShowPokedexMenu: ; 40000 (10:4000) ; 00: showed pokemon data or area ; 01: the player chose Quit ; 02: the pokemon has not been seen yet or the player pressed the B button -HandlePokedexSideMenu: ; 4006d (10:406d) +HandlePokedexSideMenu: call PlaceUnfilledArrowMenuCursor ld a,[wCurrentMenuItem] push af @@ -150,7 +150,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ; handles the list of pokemon on the left of the pokedex screen ; sets carry flag if player presses A, unsets carry flag if player presses B -HandlePokedexListMenu: ; 40111 (10:4111) +HandlePokedexListMenu: xor a ld [H_AUTOBGTRANSFERENABLED],a ; draw the horizontal line separating the seen and owned amounts from the menu @@ -342,7 +342,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) and a ret -DrawPokedexVerticalLine: ; 4028e (10:428e) +DrawPokedexVerticalLine: ld c,9 ; height of line ld de,20 ; width of screen ld a,$71 ; vertical line tile @@ -354,16 +354,16 @@ DrawPokedexVerticalLine: ; 4028e (10:428e) jr nz,.loop ret -PokedexSeenText: ; 4029d (10:429d) +PokedexSeenText: db "SEEN@" -PokedexOwnText: ; 402a2 (10:42a2) +PokedexOwnText: db "OWN@" -PokedexContentsText: ; 402a6 (10:42a6) +PokedexContentsText: db "CONTENTS@" -PokedexMenuItemsText: ; 402af (10:42af) +PokedexMenuItemsText: db "DATA" next "CRY" next "AREA" @@ -373,7 +373,7 @@ PokedexMenuItemsText: ; 402af (10:42af) ; INPUT: ; [wd11e] = pokedex number ; hl = address of bit field -IsPokemonBitSet: ; 402c2 (10:42c2) +IsPokemonBitSet: ld a,[wd11e] dec a ld c,a @@ -384,14 +384,14 @@ IsPokemonBitSet: ; 402c2 (10:42c2) ret ; function to display pokedex data from outside the pokedex -ShowPokedexData: ; 402d1 (10:42d1) +ShowPokedexData: call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites callab LoadPokedexTilePatterns ; load pokedex tiles ; function to display pokedex data from inside the pokedex -ShowPokedexDataInternal: ; 402e2 (10:42e2) +ShowPokedexDataInternal: ld hl,wd72c set 1,[hl] ld a,$33 ; 3/7 volume @@ -567,15 +567,15 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld [rNR50],a ret -HeightWeightText: ; 40448 (10:4448) +HeightWeightText: db "HT ?",$60,"??",$61,$4E,"WT ???lb@" ; XXX does anything point to this? -PokeText: ; 4045d (10:445d) +PokeText: db "#@" ; horizontal line that divides the pokedex text description from the rest of the data -PokedexDataDividerLine: ; 4045f (10:445f) +PokedexDataDividerLine: db $68,$69,$6B,$69,$6B db $69,$6B,$69,$6B,$6B db $6B,$6B,$69,$6B,$69 @@ -588,7 +588,7 @@ PokedexDataDividerLine: ; 4045f (10:445f) ; c = number of tile ID's to write ; de = amount to destination address after each tile (1 for horizontal, 20 for vertical) ; hl = destination address -DrawTileLine: ; 40474 (10:4474) +DrawTileLine: push bc push de .loop @@ -602,7 +602,7 @@ DrawTileLine: ; 40474 (10:4474) INCLUDE "data/pokedex_entries.asm" -PokedexToIndex: ; 40ff9 (10:4ff9) +PokedexToIndex: ; converts the Pokédex number at wd11e to an index push bc push hl @@ -623,7 +623,7 @@ PokedexToIndex: ; 40ff9 (10:4ff9) pop bc ret -IndexToPokedex: ; 41010 (10:5010) +IndexToPokedex: ; converts the indexédex number at wd11e to a Pokédex number push bc push hl diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index 434a1943..b48fa99c 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -1,4 +1,4 @@ -CeladonPrizeMenu: ; 5271b (14:671b) +CeladonPrizeMenu: ld b,COIN_CASE call IsItemInBag jr nz,.havingCoinCase @@ -42,20 +42,20 @@ CeladonPrizeMenu: ; 5271b (14:671b) res 6,[hl] ret -RequireCoinCaseTextPtr: ; 5277e (14:677e) +RequireCoinCaseTextPtr: TX_FAR _RequireCoinCaseText db $0D db "@" -ExchangeCoinsForPrizesTextPtr: ; 52784 (14:6784) +ExchangeCoinsForPrizesTextPtr: TX_FAR _ExchangeCoinsForPrizesText db "@" -WhichPrizeTextPtr: ; 52789 (14:6789) +WhichPrizeTextPtr: TX_FAR _WhichPrizeText db "@" -GetPrizeMenuId: ; 5278e (14:678e) +GetPrizeMenuId: ; determine which one among the three ; prize-texts has been selected ; using the text ID (stored in [hSpriteIndexOrTextID]) @@ -147,7 +147,7 @@ GetPrizeMenuId: ; 5278e (14:678e) INCLUDE "data/prizes.asm" -PrintPrizePrice: ; 5287a (14:687a) +PrintPrizePrice: coord hl, 11, 0 ld b,$01 ld c,$07 @@ -171,7 +171,7 @@ PrintPrizePrice: ; 5287a (14:687a) .SixSpacesText db " @" -LoadCoinsToSubtract: ; 528b1 (14:68b1) +LoadCoinsToSubtract: ld a,[wWhichPrize] add a ld d,0 @@ -186,7 +186,7 @@ LoadCoinsToSubtract: ; 528b1 (14:68b1) ld [hCoins + 1],a ret -HandlePrizeChoice: ; 528c6 (14:68c6) +HandlePrizeChoice: ld a,[wCurrentMenuItem] ld [wWhichPrize],a ld d,0 @@ -260,35 +260,35 @@ HandlePrizeChoice: ; 528c6 (14:68c6) ld hl,OhFineThenTextPtr jp PrintText -UnknownData52951: ; 52951 (14:6951) +UnknownData52951: ; XXX what's this? db $00,$01,$00,$01,$00,$01,$00,$00,$01 -HereYouGoTextPtr: ; 5295a (14:695a) +HereYouGoTextPtr: TX_FAR _HereYouGoText db $0D db "@" -SoYouWantPrizeTextPtr: ; 52960 (14:6960) +SoYouWantPrizeTextPtr: TX_FAR _SoYouWantPrizeText db "@" -SorryNeedMoreCoinsText: ; 52965 (14:6965) +SorryNeedMoreCoinsText: TX_FAR _SorryNeedMoreCoinsText db $0D db "@" -PrizeRoomBagIsFullTextPtr: ; 5296b (14:696b) +PrizeRoomBagIsFullTextPtr: TX_FAR _OopsYouDontHaveEnoughRoomText db $0D db "@" -OhFineThenTextPtr: ; 52971 (14:6971) +OhFineThenTextPtr: TX_FAR _OhFineThenText db $0D ; wait keypress (A/B) without blink db "@" -GetPrizeMonLevel: ; 52977 (14:6977) +GetPrizeMonLevel: ld a,[wcf91] ld b,a ld hl,PrizeMonLevelDictionary diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 3c48e6ed..029d8c01 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -1,4 +1,4 @@ -DisplayStartMenu:: ; 2acd (0:2acd) +DisplayStartMenu:: ld a,BANK(StartMenu_Pokedex) ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a @@ -7,7 +7,7 @@ DisplayStartMenu:: ; 2acd (0:2acd) ld a, SFX_START_MENU call PlaySound -RedisplayStartMenu:: ; 2adf (0:2adf) +RedisplayStartMenu:: callba DrawStartMenu callba PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone call UpdateSprites @@ -76,7 +76,7 @@ RedisplayStartMenu:: ; 2adf (0:2adf) jp z,StartMenu_Option ; EXIT falls through to here -CloseStartMenu:: ; 2b70 (0:2b70) +CloseStartMenu:: call Joypad ld a,[hJoyPressed] bit 0,a ; was A button newly pressed? diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 34c21da0..9ae6cbe5 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -1,4 +1,4 @@ -StartMenu_Pokedex: ; 13095 (4:7095) +StartMenu_Pokedex: predef ShowPokedexMenu call LoadScreenTilesFromBuffer2 ; restore saved screen call Delay3 @@ -6,7 +6,7 @@ StartMenu_Pokedex: ; 13095 (4:7095) call UpdateSprites jp RedisplayStartMenu -StartMenu_Pokemon: ; 130a9 (4:70a9) +StartMenu_Pokemon: ld a,[wPartyCount] and a jp z,RedisplayStartMenu @@ -284,7 +284,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) db "@" ; writes a blank tile to all possible menu cursor positions on the party menu -ErasePartyMenuCursors: ; 132ed (4:72ed) +ErasePartyMenuCursors: coord hl, 0, 1 ld bc,2 * 20 ; menu cursor positions are 2 rows apart ld a,6 ; 6 menu cursor positions @@ -295,11 +295,11 @@ ErasePartyMenuCursors: ; 132ed (4:72ed) jr nz,.loop ret -ItemMenuLoop: ; 132fc (4:72fc) +ItemMenuLoop: call LoadScreenTilesFromBuffer2DisableBGTransfer ; restore saved screen call RunDefaultPaletteCommand -StartMenu_Item: ; 13302 (4:7302) +StartMenu_Item: ld a,[wLinkState] dec a ; is the player in the Colosseum or Trade Centre? jr nz,.notInCableClubRoom @@ -438,16 +438,16 @@ StartMenu_Item: ; 13302 (4:7302) .tossZeroItems jp ItemMenuLoop -CannotUseItemsHereText: ; 1342a (4:742a) +CannotUseItemsHereText: TX_FAR _CannotUseItemsHereText db "@" -CannotGetOffHereText: ; 1342f (4:742f) +CannotGetOffHereText: TX_FAR _CannotGetOffHereText db "@" ; items which bring up the party menu when used -UsableItems_PartyMenu: ; 13434 (4:7434) +UsableItems_PartyMenu: db MOON_STONE db ANTIDOTE db BURN_HEAL @@ -487,7 +487,7 @@ UsableItems_PartyMenu: ; 13434 (4:7434) db $ff ; items which close the item menu when used -UsableItems_CloseMenu: ; 13459 (4:7459) +UsableItems_CloseMenu: db ESCAPE_ROPE db ITEMFINDER db POKE_FLUTE @@ -496,7 +496,7 @@ UsableItems_CloseMenu: ; 13459 (4:7459) db SUPER_ROD db $ff -StartMenu_TrainerInfo: ; 13460 (4:7460) +StartMenu_TrainerInfo: call GBPalWhiteOut call ClearScreen call UpdateSprites @@ -521,7 +521,7 @@ StartMenu_TrainerInfo: ; 13460 (4:7460) jp RedisplayStartMenu ; loads tile patterns and draws everything except for gym leader faces / badges -DrawTrainerInfo: ; 1349a (4:749a) +DrawTrainerInfo: ld de,RedPicFront lb bc, BANK(RedPicFront), $01 predef DisplayPicCenteredOrUpperRight @@ -610,17 +610,17 @@ DrawTrainerInfo: ; 1349a (4:749a) lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber -TrainerInfo_FarCopyData: ; 1357f (4:757f) +TrainerInfo_FarCopyData: ld a,BANK(TrainerInfoTextBoxTileGraphics) jp FarCopyData2 -TrainerInfo_NameMoneyTimeText: ; 13584 (4:7584) +TrainerInfo_NameMoneyTimeText: db "NAME/" next "MONEY/" next "TIME/@" ; $76 is a circle tile -TrainerInfo_BadgesText: ; 13597 (4:7597) +TrainerInfo_BadgesText: db $76,"BADGES",$76,"@" ; draws a text box on the trainer info screen @@ -630,7 +630,7 @@ TrainerInfo_BadgesText: ; 13597 (4:7597) ; [wTrainerInfoTextBoxWidthPlus1] = width ; [wTrainerInfoTextBoxWidth] = width - 1 ; [wTrainerInfoTextBoxNextRowOffset] = distance from the end of a text box row to the start of the next -TrainerInfo_DrawTextBox: ; 135a0 (4:75a0) +TrainerInfo_DrawTextBox: ld a,$79 ; upper left corner tile ID lb de, $7a, $7b ; top edge and upper right corner tile ID's call TrainerInfo_DrawHorizontalEdge ; draw top edge @@ -649,7 +649,7 @@ TrainerInfo_DrawTextBox: ; 135a0 (4:75a0) ld a,$7d ; lower left corner tile ID lb de,$77, $7e ; bottom edge and lower right corner tile ID's -TrainerInfo_DrawHorizontalEdge: ; 135c3 (4:75c3) +TrainerInfo_DrawHorizontalEdge: ld [hli],a ; place left corner tile ld a,[wTrainerInfoTextBoxWidth] ld c,a @@ -662,7 +662,7 @@ TrainerInfo_DrawHorizontalEdge: ; 135c3 (4:75c3) ld [hl],a ; place right corner tile ret -TrainerInfo_NextTextBoxRow: ; 135d0 (4:75d0) +TrainerInfo_NextTextBoxRow: ld a,[wTrainerInfoTextBoxNextRowOffset] ; distance to the start of the next row .loop inc hl @@ -674,7 +674,7 @@ TrainerInfo_NextTextBoxRow: ; 135d0 (4:75d0) ; INPUT: ; hl = address of top tile in the line ; a = tile ID -TrainerInfo_DrawVerticalLine: ; 135d8 (4:75d8) +TrainerInfo_DrawVerticalLine: ld de,20 ld c,8 .loop @@ -684,7 +684,7 @@ TrainerInfo_DrawVerticalLine: ; 135d8 (4:75d8) jr nz,.loop ret -StartMenu_SaveReset: ; 135e3 (4:75e3) +StartMenu_SaveReset: ld a,[wd72e] bit 6,a ; is the player using the link feature? jp nz,Init @@ -692,7 +692,7 @@ StartMenu_SaveReset: ; 135e3 (4:75e3) call LoadScreenTilesFromBuffer2 ; restore saved screen jp HoldTextDisplayOpen -StartMenu_Option: ; 135f6 (4:75f6) +StartMenu_Option: xor a ld [H_AUTOBGTRANSFERENABLED],a call ClearScreen @@ -703,7 +703,7 @@ StartMenu_Option: ; 135f6 (4:75f6) call UpdateSprites jp RedisplayStartMenu -SwitchPartyMon: ; 13613 (4:7613) +SwitchPartyMon: call SwitchPartyMon_InitVarOrSwapData ; swap data ld a, [wSwappedMenuItem] call SwitchPartyMon_ClearGfx @@ -711,7 +711,7 @@ SwitchPartyMon: ; 13613 (4:7613) call SwitchPartyMon_ClearGfx jp RedrawPartyMenu_ -SwitchPartyMon_ClearGfx: ; 13625 (4:7625) +SwitchPartyMon_ClearGfx: push af coord hl, 0, 0 ld bc, SCREEN_WIDTH * 2 @@ -737,7 +737,7 @@ SwitchPartyMon_ClearGfx: ; 13625 (4:7625) ld a, SFX_SWAP jp PlaySound -SwitchPartyMon_InitVarOrSwapData: ; 13653 (4:7653) +SwitchPartyMon_InitVarOrSwapData: ; This is used to initialise [wMenuItemToSwap] and to actually swap the data. ld a, [wMenuItemToSwap] and a ; has [wMenuItemToSwap] been initialised yet? diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index d07cc026..4770483d 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -1,15 +1,15 @@ -DrawHP: ; 128ef (4:68ef) +DrawHP: ; Draws the HP bar in the stats screen call GetPredefRegisters ld a, $1 jr DrawHP_ -DrawHP2: ; 128f6 (4:68f6) +DrawHP2: ; Draws the HP bar in the party screen call GetPredefRegisters ld a, $2 -DrawHP_: ; 128fb (4:68fb) +DrawHP_: ld [wHPBarType], a push hl ld a, [wLoadedMonHP] @@ -63,7 +63,7 @@ DrawHP_: ; 128fb (4:68fb) ; Predef 0x37 -StatusScreen: ; 12953 (4:6953) +StatusScreen: call LoadMonData ld a, [wMonDataLocation] cp BOX_DATA @@ -192,34 +192,34 @@ StatusScreen: ; 12953 (4:6953) ld a, [wWhichPokemon] jp SkipFixedLengthTextEntries -OTPointers: ; 12a95 (4:6a95) +OTPointers: dw wPartyMonOT dw wEnemyMonOT dw wBoxMonOT dw wDayCareMonOT -NamePointers2: ; 12a9d (4:6a9d) +NamePointers2: dw wPartyMonNicks dw wEnemyMonNicks dw wBoxMonNicks dw wDayCareMonName -Type1Text: ; 12aa5 (4:6aa5) +Type1Text: db "TYPE1/", $4e -Type2Text: ; 12aac (4:6aac) +Type2Text: db "TYPE2/", $4e -IDNoText: ; 12ab3 (4:6ab3) +IDNoText: db $73, "№", "/", $4e -OTText: ; 12ab7 (4:6ab7) +OTText: db "OT/", $4e, "@" -StatusText: ; 12abc (4:6abc) +StatusText: db "STATUS/@" -OKText: ; 12ac4 (4:6ac4) +OKText: db "OK@" ; Draws a line starting from hl high b and wide c @@ -244,7 +244,7 @@ PTile: ; 12adc (4:6adc) ; This is a single 1bpp "P" tile INCBIN "gfx/p_tile.1bpp" PTileEnd: -PrintStatsBox: ; 12ae4 (4:6ae4) +PrintStatsBox: ld a, d and a ; a is 0 from the status screen jr nz, .DifferentBox @@ -287,13 +287,13 @@ PrintStat add hl, de ret -StatsText: ; 12b3a (4:6b3a) +StatsText: db "ATTACK" next "DEFENSE" next "SPEED" next "SPECIAL@" -StatusScreen2: ; 12b57 (4:6b57) +StatusScreen2: ld a, [hTilesetType] push af xor a @@ -435,7 +435,7 @@ StatusScreen2: ; 12b57 (4:6b57) call GBPalWhiteOut jp ClearScreen -CalcExpToLevelUp: ; 12c86 (4:6c86) +CalcExpToLevelUp: ld a, [wLoadedMonLevel] cp MAX_LEVEL jr z, .atMaxLevel @@ -461,16 +461,16 @@ CalcExpToLevelUp: ; 12c86 (4:6c86) ld [hl], a ret -StatusScreenExpText: ; 12caf (4:6caf) +StatusScreenExpText: db "EXP POINTS" next "LEVEL UP@" -StatusScreen_ClearName: ; 12cc3 (4:6cc3) +StatusScreen_ClearName: ld bc, 10 ld a, " " jp FillMemory -StatusScreen_PrintPP: ; 12ccb (4:6ccb) +StatusScreen_PrintPP: ; print PP or -- c times, going down two rows each time ld [hli], a ld [hld], a diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 8460889f..b32568f9 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -1,4 +1,4 @@ -VendingMachineMenu: ; 74ee0 (1d:4ee0) +VendingMachineMenu: ld hl, VendingMachineText1 call PrintText ld a, MONEY_BOX @@ -80,38 +80,38 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld hl, VendingMachineText7 jp PrintText -VendingMachineText1: ; 74f99 (1d:4f99) +VendingMachineText1: TX_FAR _VendingMachineText1 db "@" -DrinkText: ; 74f9e (1d:4f9e) +DrinkText: db "FRESH WATER" next "SODA POP" next "LEMONADE" next "CANCEL@" -DrinkPriceText: ; 74fc3 (1d:4fc3) +DrinkPriceText: db "¥200" next "¥300" next "¥350",$4E,"@" -VendingMachineText4: ; 74fd3 (1d:4fd3) +VendingMachineText4: TX_FAR _VendingMachineText4 db "@" -VendingMachineText5: ; 74fd8 (1d:4fd8) +VendingMachineText5: TX_FAR _VendingMachineText5 db "@" -VendingMachineText6: ; 74fdd (1d:4fdd) +VendingMachineText6: TX_FAR _VendingMachineText6 db "@" -VendingMachineText7: ; 74fe2 (1d:4fe2) +VendingMachineText7: TX_FAR _VendingMachineText7 db "@" -LoadVendingMachineItem: ; 74fe7 (1d:4fe7) +LoadVendingMachineItem: ld hl, VendingPrices ld a, [wCurrentMenuItem] add a @@ -129,7 +129,7 @@ LoadVendingMachineItem: ; 74fe7 (1d:4fe7) ld [hVendingMachinePrice + 2], a ret -VendingPrices: ; 75000 (1d:5000) +VendingPrices: db FRESH_WATER,$00,$02,$00 db SODA_POP, $00,$03,$00 db LEMONADE, $00,$03,$50 diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index 185151cb..6845b790 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -1,4 +1,4 @@ -AnimatePartyMon_ForceSpeed1: ; 716f7 (1c:56f7) +AnimatePartyMon_ForceSpeed1: xor a ld [wCurrentMenuItem], a ld b, a @@ -9,7 +9,7 @@ AnimatePartyMon_ForceSpeed1: ; 716f7 (1c:56f7) ; 0: green ; 1: yellow ; 2: red -AnimatePartyMon: ; 716ff (1c:56ff) +AnimatePartyMon: ld hl, wPartyMenuHPBarColors ld a, [wCurrentMenuItem] ld c, a @@ -17,7 +17,7 @@ AnimatePartyMon: ; 716ff (1c:56ff) add hl, bc ld a, [hl] -GetAnimationSpeed: ; 7170a (1c:570a) +GetAnimationSpeed: ld c, a ld hl, PartyMonSpeeds add hl, bc @@ -85,15 +85,15 @@ GetAnimationSpeed: ; 7170a (1c:570a) ; The members of the PartyMonSpeeds array specify the number of V-blanks ; that each frame lasts for green HP, yellow HP, and red HP in order. ; On the naming screen, the yellow HP speed is always used. -PartyMonSpeeds: ; 71769 (1c:5769) +PartyMonSpeeds: db 5, 16, 32 -LoadMonPartySpriteGfx: ; 7176c (1c:576c) +LoadMonPartySpriteGfx: ; Load mon party sprite tile patterns into VRAM during V-blank. ld hl, MonPartySpritePointers ld a, $1c -LoadAnimSpriteGfx: ; 71771 (1c:5771) +LoadAnimSpriteGfx: ; Load animated sprite tile patterns into VRAM during V-blank. hl is the address ; of an array of structures that contain arguments for CopyVideoData and a is ; the number of structures in the array. @@ -125,7 +125,7 @@ LoadAnimSpriteGfx: ; 71771 (1c:5771) jr nz, .loop ret -LoadMonPartySpriteGfxWithLCDDisabled: ; 71791 (1c:5791) +LoadMonPartySpriteGfxWithLCDDisabled: ; Load mon party sprite tile patterns into VRAM immediately by disabling the ; LCD. call DisableLCD @@ -162,7 +162,7 @@ LoadMonPartySpriteGfxWithLCDDisabled: ; 71791 (1c:5791) jr nz, .asm_7179c jp EnableLCD -MonPartySpritePointers: ; 717c0 (1c:57c0) +MonPartySpritePointers: dw SlowbroSprite + $c0 db $40 / $10 ; 40 bytes db BANK(SlowbroSprite) @@ -303,7 +303,7 @@ MonPartySpritePointers: ; 717c0 (1c:57c0) db BANK(MonPartySprites) dw vSprites + $780 -WriteMonPartySpriteOAMByPartyIndex: ; 71868 (1c:5868) +WriteMonPartySpriteOAMByPartyIndex: ; Write OAM blocks for the party mon in [hPartyMonIndex]. push hl push de @@ -322,7 +322,7 @@ WriteMonPartySpriteOAMByPartyIndex: ; 71868 (1c:5868) pop hl ret -WriteMonPartySpriteOAMBySpecies: ; 71882 (1c:5882) +WriteMonPartySpriteOAMBySpecies: ; Write OAM blocks for the party sprite of the species in ; [wMonPartySpriteSpecies]. xor a @@ -332,7 +332,7 @@ WriteMonPartySpriteOAMBySpecies: ; 71882 (1c:5882) ld [wOAMBaseTile], a jr WriteMonPartySpriteOAM -UnusedPartyMonSpriteFunction: ; 71890 (1c:5890) +UnusedPartyMonSpriteFunction: ; This function is unused and doesn't appear to do anything useful. It looks ; like it may have been intended to load the tile patterns and OAM data for ; the mon party sprite associated with the species in [wcf91]. @@ -370,7 +370,7 @@ UnusedPartyMonSpriteFunction: ; 71890 (1c:5890) pop hl jp CopyVideoData -WriteMonPartySpriteOAM: ; 718c3 (1c:58c3) +WriteMonPartySpriteOAM: ; Write the OAM blocks for the first animation frame into the OAM buffer and ; make a copy at wMonPartySpritesSavedOAM. push af @@ -396,7 +396,7 @@ WriteMonPartySpriteOAM: ; 718c3 (1c:58c3) ld bc, $60 jp CopyData -GetPartyMonSpriteID: ; 718e9 (1c:58e9) +GetPartyMonSpriteID: ld [wd11e], a predef IndexToPokedex ld a, [wd11e] @@ -419,5 +419,5 @@ GetPartyMonSpriteID: ; 718e9 (1c:58e9) INCLUDE "data/mon_party_sprites.asm" -MonPartySprites: ; 71959 (1c:5959) +MonPartySprites: INCBIN "gfx/mon_ow_sprites.2bpp" diff --git a/engine/multiply_divide.asm b/engine/multiply_divide.asm index ec16c42b..52e86b36 100755 --- a/engine/multiply_divide.asm +++ b/engine/multiply_divide.asm @@ -1,4 +1,4 @@ -_Multiply: ; 37d41 (d:7d41) +_Multiply: ld a, $8 ld b, a xor a @@ -59,7 +59,7 @@ _Multiply: ; 37d41 (d:7d41) ld [H_PRODUCT], a ret -_Divide: ; 37da5 (d:7da5) +_Divide: xor a ld [H_DIVIDEBUFFER], a ld [H_DIVIDEBUFFER+1], a diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index c4d35639..31c00fd0 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -1,4 +1,4 @@ -SetDefaultNames: ; 60ca (1:60ca) +SetDefaultNames: ld a, [wLetterPrintingDelayFlags] push af ld a, [wOptions] @@ -31,7 +31,7 @@ SetDefaultNames: ; 60ca (1:60ca) ld bc, NAME_LENGTH jp CopyData -OakSpeech: ; 6115 (1:6115) +OakSpeech: ld a,$FF call PlaySound ; stop music ld a, BANK(Music_Routes2) @@ -152,25 +152,25 @@ OakSpeech: ; 6115 (1:6115) call DelayFrames call GBFadeOutToWhite jp ClearScreen -OakSpeechText1: ; 6253 (1:6253) +OakSpeechText1: TX_FAR _OakSpeechText1 db "@" -OakSpeechText2: ; 6258 (1:6258) +OakSpeechText2: TX_FAR _OakSpeechText2A db $14 ; play NIDORINA cry from TextCommandSounds TX_FAR _OakSpeechText2B db "@" -IntroducePlayerText: ; 6262 (1:6262) +IntroducePlayerText: TX_FAR _IntroducePlayerText db "@" -IntroduceRivalText: ; 6267 (1:6267) +IntroduceRivalText: TX_FAR _IntroduceRivalText db "@" -OakSpeechText3: ; 626c (1:626c) +OakSpeechText3: TX_FAR _OakSpeechText3 db "@" -FadeInIntroPic: ; 6271 (1:6271) +FadeInIntroPic: ld hl,IntroFadePalettes ld b,6 .next @@ -182,7 +182,7 @@ FadeInIntroPic: ; 6271 (1:6271) jr nz,.next ret -IntroFadePalettes: ; 6282 (1:6282) +IntroFadePalettes: db %01010100 db %10101000 db %11111100 @@ -190,7 +190,7 @@ IntroFadePalettes: ; 6282 (1:6282) db %11110100 db %11100100 -MovePicLeft: ; 6288 (1:6288) +MovePicLeft: ld a,119 ld [rWX],a call DelayFrame @@ -206,9 +206,9 @@ MovePicLeft: ; 6288 (1:6288) ld [rWX],a jr .next -DisplayPicCenteredOrUpperRight: ; 62a1 (1:62a1) +DisplayPicCenteredOrUpperRight: call GetPredefRegisters -IntroDisplayPicCenteredOrUpperRight: ; 62a4 (1:62a4) +IntroDisplayPicCenteredOrUpperRight: ; b = bank ; de = address of compressed pic ; c: 0 = centred, non-zero = upper-right diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index d58aef83..1ae06313 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -1,4 +1,4 @@ -ChoosePlayerName: ; 695d (1:695d) +ChoosePlayerName: call OakSpeechSlidePicRight ld de, DefaultNamesPlayer call DisplayIntroNameTextBox @@ -27,11 +27,11 @@ ChoosePlayerName: ; 695d (1:695d) ld hl, YourNameIsText jp PrintText -YourNameIsText: ; 699f (1:699f) +YourNameIsText: TX_FAR _YourNameIsText db "@" -ChooseRivalName: ; 69a4 (1:69a4) +ChooseRivalName: call OakSpeechSlidePicRight ld de, DefaultNamesRival call DisplayIntroNameTextBox @@ -60,11 +60,11 @@ ChooseRivalName: ; 69a4 (1:69a4) ld hl, HisNameIsText jp PrintText -HisNameIsText: ; 69e7 (1:69e7) +HisNameIsText: TX_FAR _HisNameIsText db "@" -OakSpeechSlidePicLeft: ; 69ec (1:69ec) +OakSpeechSlidePicLeft: push de coord hl, 0, 0 lb bc, 12, 11 @@ -81,12 +81,12 @@ OakSpeechSlidePicLeft: ; 69ec (1:69ec) ld a, $ff jr OakSpeechSlidePicCommon -OakSpeechSlidePicRight: ; 6a12 (1:6a12) +OakSpeechSlidePicRight: coord hl, 5, 4 lb de, 6, 6 * SCREEN_WIDTH + 5 xor a -OakSpeechSlidePicCommon: ; 6a19 (1:6a19) +OakSpeechSlidePicCommon: push hl push de push bc @@ -159,7 +159,7 @@ OakSpeechSlidePicCommon: ; 6a19 (1:6a19) pop hl ret -DisplayIntroNameTextBox: ; 6a6c (1:6a6c) +DisplayIntroNameTextBox: push de coord hl, 0, 0 ld b, $a @@ -188,14 +188,14 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c) db "NAME@" IF DEF(_RED) -DefaultNamesPlayer: ; 6aa8 (1:6aa8) +DefaultNamesPlayer: db "NEW NAME" next "RED" next "ASH" next "JACK" db "@" -DefaultNamesRival: ; 6abe (1:6abe) +DefaultNamesRival: db "NEW NAME" next "BLUE" next "GARY" @@ -204,14 +204,14 @@ DefaultNamesRival: ; 6abe (1:6abe) ENDC IF DEF(_BLUE) -DefaultNamesPlayer: ; 6aa8 (1:6aa8) +DefaultNamesPlayer: db "NEW NAME" next "BLUE" next "GARY" next "JOHN" db "@" -DefaultNamesRival: ; 6abe (1:6abe) +DefaultNamesRival: db "NEW NAME" next "RED" next "ASH" @@ -219,7 +219,7 @@ DefaultNamesRival: ; 6abe (1:6abe) db "@" ENDC -GetDefaultName: ; 6ad6 (1:6ad6) +GetDefaultName: ; a = name index ; hl = name list ld b, a @@ -244,29 +244,29 @@ GetDefaultName: ; 6ad6 (1:6ad6) jp CopyData IF DEF(_RED) -DefaultNamesPlayerList: ; 6af2 (1:6af2) +DefaultNamesPlayerList: db "NEW NAME@" db "RED@" db "ASH@" db "JACK@" -DefaultNamesRivalList: ; 6b08 (1:6b08) +DefaultNamesRivalList: db "NEW NAME@" db "BLUE@" db "GARY@" db "JOHN@" ENDC IF DEF(_BLUE) -DefaultNamesPlayerList: ; 6af2 (1:6af2) +DefaultNamesPlayerList: db "NEW NAME@" db "BLUE@" db "GARY@" db "JOHN@" -DefaultNamesRivalList: ; 6b08 (1:6b08) +DefaultNamesRivalList: db "NEW NAME@" db "RED@" db "ASH@" db "JACK@" ENDC -TextTerminator_6b20: ; 6b20 (1:6b20) +TextTerminator_6b20: db "@" diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index a2feba06..70b499a0 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -1,4 +1,4 @@ -CableClubNPC: ; 71c5 (1:71c5) +CableClubNPC: ld hl, CableClubNPCWelcomeText call PrintText CheckEvent EVENT_GOT_POKEDEX @@ -109,35 +109,35 @@ CableClubNPC: ; 71c5 (1:71c5) ld [hl], a jpab LinkMenu -CableClubNPCAreaReservedFor2FriendsLinkedByCableText: ; 72b3 (1:72b3) +CableClubNPCAreaReservedFor2FriendsLinkedByCableText: TX_FAR _CableClubNPCAreaReservedFor2FriendsLinkedByCableText db "@" -CableClubNPCWelcomeText: ; 72b8 (1:72b8) +CableClubNPCWelcomeText: TX_FAR _CableClubNPCWelcomeText db "@" -CableClubNPCPleaseApplyHereHaveToSaveText: ; 72bd (1:72bd) +CableClubNPCPleaseApplyHereHaveToSaveText: TX_FAR _CableClubNPCPleaseApplyHereHaveToSaveText db "@" -CableClubNPCPleaseWaitText: ; 72c2 (1:72c2) +CableClubNPCPleaseWaitText: TX_FAR _CableClubNPCPleaseWaitText db $a, "@" -CableClubNPCLinkClosedBecauseOfInactivityText: ; 72c8 (1:72c8) +CableClubNPCLinkClosedBecauseOfInactivityText: TX_FAR _CableClubNPCLinkClosedBecauseOfInactivityText db "@" -CableClubNPCPleaseComeAgainText: ; 72cd (1:72cd) +CableClubNPCPleaseComeAgainText: TX_FAR _CableClubNPCPleaseComeAgainText db "@" -CableClubNPCMakingPreparationsText: ; 72d2 (1:72d2) +CableClubNPCMakingPreparationsText: TX_FAR _CableClubNPCMakingPreparationsText db "@" -CloseLinkConnection: ; 72d7 (1:72d7) +CloseLinkConnection: call Delay3 ld a, CONNECTION_NOT_ESTABLISHED ld [hSerialConnectionStatus], a diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index 49d99575..61e512de 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -1,4 +1,4 @@ -PrintCardKeyText: ; 52673 (14:6673) +PrintCardKeyText: ld hl, SilphCoMapList ld a, [wCurMap] ld b, a @@ -58,7 +58,7 @@ PrintCardKeyText: ; 52673 (14:6673) ld [hSpriteIndexOrTextID], a jp PrintPredefTextID -SilphCoMapList: ; 526e3 (14:66e3) +SilphCoMapList: db SILPH_CO_2F db SILPH_CO_3F db SILPH_CO_4F @@ -71,19 +71,19 @@ SilphCoMapList: ; 526e3 (14:66e3) db SILPH_CO_11F db $FF -CardKeySuccessText: ; 526ee (14:66ee) +CardKeySuccessText: TX_FAR _CardKeySuccessText1 db $0b TX_FAR _CardKeySuccessText2 db "@" -CardKeyFailText: ; 526f8 (14:66f8) +CardKeyFailText: TX_FAR _CardKeyFailText db "@" ; d = Y ; e = X -GetCoordsInFrontOfPlayer: ; 526fd (14:66fd) +GetCoordsInFrontOfPlayer: ld a, [wYCoord] ld d, a ld a, [wXCoord] diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index f7c5e326..13313746 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -1,4 +1,4 @@ -GiveFossilToCinnabarLab: ; 61006 (18:5006) +GiveFossilToCinnabarLab: ld hl, wd730 set 6, [hl] xor a @@ -72,23 +72,23 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) call PrintText ret -LabFossil_610ae: ; 610ae (18:50ae) +LabFossil_610ae: TX_FAR _Lab4Text_610ae db "@" -LabFossil_610b3: ; 610b3 (18:50b3) +LabFossil_610b3: TX_FAR _Lab4Text_610b3 db "@" -LabFossil_610b8: ; 610b8 (18:50b8) +LabFossil_610b8: TX_FAR _Lab4Text_610b8 db "@" -LabFossil_610bd: ; 610bd (18:50bd) +LabFossil_610bd: TX_FAR _Lab4Text_610bd db "@" -PrintFossilsInBag: ; 610c2 (18:50c2) +PrintFossilsInBag: ; Prints each fossil in the player's bag on a separate line in the menu. ld hl, wFilteredBagItems xor a @@ -112,7 +112,7 @@ PrintFossilsInBag: ; 610c2 (18:50c2) jr .loop ; loads the names of the fossil item and the resulting mon -LoadFossilItemAndMonName: ; 610eb (18:50eb) +LoadFossilItemAndMonName: ld a, [wFossilMon] ld [wd11e], a call GetMonName diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 8a0513b2..2f13dfba 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -1,4 +1,4 @@ -UsedCut: ; ef54 (3:6f54) +UsedCut: xor a ld [wActionResultOrTookBattleTurn], a ; initialise to failure value ld a, [wCurMapTileset] @@ -67,11 +67,11 @@ UsedCut: ; ef54 (3:6f54) call UpdateSprites jp RedrawMapView -UsedCutText: ; eff2 (3:6ff2) +UsedCutText: TX_FAR _UsedCutText db "@" -InitCutAnimOAM: ; eff7 (3:6ff7) +InitCutAnimOAM: xor a ld [wWhichAnimationOffsets], a ld a, $e4 @@ -111,22 +111,22 @@ InitCutAnimOAM: ; eff7 (3:6ff7) jr nz, .loop ret -LoadCutGrassAnimationTilePattern: ; f04c (3:704c) +LoadCutGrassAnimationTilePattern: ld de, AnimationTileset2 + $60 ; tile depicting a leaf lb bc, BANK(AnimationTileset2), $01 jp CopyVideoData -WriteCutOrBoulderDustAnimationOAMBlock: ; f055 (3:7055) +WriteCutOrBoulderDustAnimationOAMBlock: call GetCutOrBoulderDustAnimationOffsets ld a, $9 ld de, CutOrBoulderDustAnimationTilesAndAttributes jp WriteOAMBlock -CutOrBoulderDustAnimationTilesAndAttributes: ; f060 (3:7060) +CutOrBoulderDustAnimationTilesAndAttributes: db $FC,$10,$FD,$10 db $FE,$10,$FF,$10 -GetCutOrBoulderDustAnimationOffsets: ; f068 (3:7068) +GetCutOrBoulderDustAnimationOffsets: ld hl, wSpriteStateData1 + 4 ld a, [hli] ; player's sprite screen Y position ld b, a @@ -157,14 +157,14 @@ GetCutOrBoulderDustAnimationOffsets: ; f068 (3:7068) ld c, a ret -CutAnimationOffsets: ; f08f (3:708f) +CutAnimationOffsets: ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn db 8, 36 ; player is facing down db 8, 4 ; player is facing up db -8, 20 ; player is facing left db 24, 20 ; player is facing right -BoulderDustAnimationOffsets: ; f097 (3:7097) +BoulderDustAnimationOffsets: ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn ; These offsets represent 2 blocks away from the player db 8, 52 ; player is facing down @@ -172,7 +172,7 @@ BoulderDustAnimationOffsets: ; f097 (3:7097) db -24, 20 ; player is facing left db 40, 20 ; player is facing right -ReplaceTreeTileBlock: ; f09f (3:709f) +ReplaceTreeTileBlock: ; Determine the address of the tile block that contains the tile in front of the ; player (i.e. where the tree is) and replace it with the corresponding tile ; block that doesn't have the tree. @@ -248,7 +248,7 @@ ReplaceTreeTileBlock: ; f09f (3:709f) ld [hl], a ret -CutTreeBlockSwaps: ; f100 (3:7100) +CutTreeBlockSwaps: ; first byte = tileset block containing the cut tree ; second byte = corresponding tileset block after the cut animation happens db $32, $6D diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm index 1cf832b5..f16fed66 100755 --- a/engine/overworld/cut2.asm +++ b/engine/overworld/cut2.asm @@ -1,4 +1,4 @@ -AnimCut: ; 79e96 (1e:5e96) +AnimCut: ld a, [wCutTile] cp $52 jr z, .grass @@ -43,7 +43,7 @@ AnimCut: ; 79e96 (1e:5e96) jr nz, .cutGrassLoop ret -AnimCutGrass_UpdateOAMEntries: ; 79eed (1e:5eed) +AnimCutGrass_UpdateOAMEntries: push bc ld hl, wOAMBuffer + $91 ld a, 1 @@ -74,7 +74,7 @@ AnimCutGrass_UpdateOAMEntries: ; 79eed (1e:5eed) jr nz, AnimCutGrass_UpdateOAMEntries ret -AnimCutGrass_SwapOAMEntries: ; 79f30 (1e:5f30) +AnimCutGrass_SwapOAMEntries: ld hl, wOAMBuffer + $90 ld de, wBuffer ld bc, $8 diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index 3145c3c6..c39e096d 100755 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -1,5 +1,5 @@ ; returns whether the player is standing on a door tile in carry -IsPlayerStandingOnDoorTile: ; 1a609 (6:6609) +IsPlayerStandingOnDoorTile: push de ld hl, DoorTileIDPointers ld a, [wCurMapTileset] @@ -25,7 +25,7 @@ IsPlayerStandingOnDoorTile: ; 1a609 (6:6609) and a ret -DoorTileIDPointers: ; 1a62c (6:662c) +DoorTileIDPointers: dbw OVERWORLD, OverworldDoorTileIDs dbw FOREST, ForestDoorTileIDs dbw MART, MartDoorTileIDs @@ -41,35 +41,35 @@ DoorTileIDPointers: ; 1a62c (6:662c) dbw PLATEAU, PlateauDoorTileIDs db $ff -OverworldDoorTileIDs: ; 1a654 (6:6654) +OverworldDoorTileIDs: db $1B,$58,$00 -ForestDoorTileIDs: ; 1a657 (6:6657) +ForestDoorTileIDs: db $3a,$00 -MartDoorTileIDs: ; 1a659 (6:6659) +MartDoorTileIDs: db $5e,$00 -HouseDoorTileIDs: ; 1a65b (6:665b) +HouseDoorTileIDs: db $54,$00 -TilesetMuseumDoorTileIDs: ; 1a65d (6:665d) +TilesetMuseumDoorTileIDs: db $3b,$00 -ShipDoorTileIDs: ; 1a65f (6:665f) +ShipDoorTileIDs: db $1e,$00 -LobbyDoorTileIDs: ; 1a661 (6:6661) +LobbyDoorTileIDs: db $1c,$38,$1a,$00 -MansionDoorTileIDs: ; 1a665 (6:6665) +MansionDoorTileIDs: db $1a,$1c,$53,$00 -LabDoorTileIDs: ; 1a669 (6:6669) +LabDoorTileIDs: db $34,$00 -FacilityDoorTileIDs: ; 1a66b (6:666b) +FacilityDoorTileIDs: db $43,$58,$1b,$00 -PlateauDoorTileIDs: ; 1a66f (6:666f) +PlateauDoorTileIDs: db $3b,$1b,$00 diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 05a9cc4e..4ec34922 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -1,4 +1,4 @@ -ShakeElevator: ; 7bf15 (1e:7f15) +ShakeElevator: ld de, -$20 call ShakeElevatorRedrawRow ld de, SCREEN_HEIGHT * $20 @@ -39,7 +39,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) call UpdateSprites jp PlayDefaultMusic -ShakeElevatorRedrawRow: ; 7bf64 (1e:7f64) +ShakeElevatorRedrawRow: ; This function is used to redraw certain portions of the screen, but it does ; not appear to ever result in any visible effect, so this function seems to ; be pointless. diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index f8665dd6..4df8b6f6 100755 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -1,4 +1,4 @@ -EmotionBubble: ; 17c47 (5:7c47) +EmotionBubble: ld a, [wWhichEmotionBubble] ld c, a ld b, 0 @@ -61,14 +61,14 @@ EmotionBubble: ; 17c47 (5:7c47) call DelayFrame jp UpdateSprites -EmotionBubblesPointerTable: ; 17caf (5:7caf) +EmotionBubblesPointerTable: dw EmotionBubbles dw EmotionBubbles + $40 dw EmotionBubbles + $80 -EmotionBubblesOAM: ; 17cb5 (5:7cb5) +EmotionBubblesOAM: db $F8,$00,$F9,$00 db $FA,$00,$FB,$00 -EmotionBubbles: ; 17cbd (5:7cbd) +EmotionBubbles: INCBIN "gfx/emotion_bubbles.2bpp" diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index bf7130cb..38a44cfb 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -1,4 +1,4 @@ -AnimateHealingMachine: ; 70433 (1c:4433) +AnimateHealingMachine: ld de, PokeCenterFlashingMonitorAndHealBall ld hl, vChars0 + $7c0 lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), $03 ; loads one too many tiles @@ -62,10 +62,10 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld [hl], a jp UpdateSprites -PokeCenterFlashingMonitorAndHealBall: ; 704b7 (1c:44b7) +PokeCenterFlashingMonitorAndHealBall: INCBIN "gfx/pokecenter_ball.2bpp" -PokeCenterOAMData: ; 704d7 (1c:44d7) +PokeCenterOAMData: db $24,$34,$7C,$10 ; heal machine monitor db $2B,$30,$7D,$10 ; pokeballs 1-6 db $2B,$38,$7D,$30 @@ -75,7 +75,7 @@ PokeCenterOAMData: ; 704d7 (1c:44d7) db $35,$38,$7D,$30 ; d = value to xor with palette -FlashSprite8Times: ; 704f3 (1c:44f3) +FlashSprite8Times: ld b, 8 .loop ld a, [rOBP1] @@ -87,7 +87,7 @@ FlashSprite8Times: ; 704f3 (1c:44f3) jr nz, .loop ret -CopyHealingMachineOAM: ; 70503 (1c:4503) +CopyHealingMachineOAM: ; copy one OAM entry and advance the pointers ld a, [de] inc de diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index f7f81070..11e6ad55 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -1,4 +1,4 @@ -HiddenItems: ; 76688 (1d:6688) +HiddenItems: ld hl, HiddenItemCoords call FindHiddenItemOrCoinsIndex ld [wHiddenItemOrCoinsIndex], a @@ -20,7 +20,7 @@ HiddenItems: ; 76688 (1d:6688) INCLUDE "data/hidden_item_coords.asm" -FoundHiddenItemText: ; 7675b (1d:675b) +FoundHiddenItemText: TX_FAR _FoundHiddenItemText TX_ASM ld a, [wHiddenObjectFunctionArgument] ; item ID @@ -45,11 +45,11 @@ FoundHiddenItemText: ; 7675b (1d:675b) call PrintText jp TextScriptEnd -HiddenItemBagFullText: ; 76794 (1d:6794) +HiddenItemBagFullText: TX_FAR _HiddenItemBagFullText db "@" -HiddenCoins: ; 76799 (1d:6799) +HiddenCoins: ld b, COIN_CASE predef GetQuantityOfItemInBag ld a, b @@ -120,17 +120,17 @@ HiddenCoins: ; 76799 (1d:6799) INCLUDE "data/hidden_coins.asm" -FoundHiddenCoinsText: ; 76847 (1d:6847) +FoundHiddenCoinsText: TX_FAR _FoundHiddenCoinsText db $10,"@" -DroppedHiddenCoinsText: ; 7684d (1d:684d) +DroppedHiddenCoinsText: TX_FAR _FoundHiddenCoins2Text db $10 TX_FAR _DroppedHiddenCoinsText db "@" -FindHiddenItemOrCoinsIndex: ; 76857 (1d:6857) +FindHiddenItemOrCoinsIndex: ld a, [wHiddenObjectY] ld d, a ld a, [wHiddenObjectX] diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm index 1fc20e5c..dcdf8537 100755 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm @@ -1,4 +1,4 @@ -IsPlayerOnDungeonWarp: ; 46981 (11:6981) +IsPlayerOnDungeonWarp: xor a ld [wWhichDungeonWarp], a ld a, [wd72d] @@ -15,7 +15,7 @@ IsPlayerOnDungeonWarp: ; 46981 (11:6981) ret ; if a hidden object was found, stores $00 in [$ffee], else stores $ff -CheckForHiddenObject: ; 469a0 (11:69a0) +CheckForHiddenObject: ld hl, $ffeb xor a ld [hli], a @@ -86,7 +86,7 @@ CheckForHiddenObject: ; 469a0 (11:69a0) ; checks if the coordinates in front of the player's sprite match Y in b and X in c ; [hCoordsInFrontOfPlayerMatch] = $00 if they match, $ff if they don't match -CheckIfCoordsInFrontOfPlayerMatch: ; 46a01 (11:6a01) +CheckIfCoordsInFrontOfPlayerMatch: ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_UP jr z, .facingUp diff --git a/engine/overworld/is_player_just_outside_map.asm b/engine/overworld/is_player_just_outside_map.asm index e9ba204a..44690db0 100644 --- a/engine/overworld/is_player_just_outside_map.asm +++ b/engine/overworld/is_player_just_outside_map.asm @@ -1,5 +1,5 @@ ; returns whether the player is one tile outside the map in Z -IsPlayerJustOutsideMap: ; 128d8 (4:68d8) +IsPlayerJustOutsideMap: ld a, [wYCoord] ld b, a ld a, [wCurMapHeight] diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index b04f6332..342540b2 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -1,4 +1,4 @@ -HandleLedges: ; 1a672 (6:6672) +HandleLedges: ld a, [wd736] bit 6, a ; already jumping down ledge ret nz @@ -55,7 +55,7 @@ HandleLedges: ; 1a672 (6:6672) ret ; (player direction) (tile player standing on) (ledge tile) (input required) -LedgeTiles: ; 1a6cf (6:66cf) +LedgeTiles: db SPRITE_FACING_DOWN, $2C,$37,D_DOWN db SPRITE_FACING_DOWN, $39,$36,D_DOWN db SPRITE_FACING_DOWN, $39,$37,D_DOWN @@ -66,7 +66,7 @@ LedgeTiles: ; 1a6cf (6:66cf) db SPRITE_FACING_RIGHT,$39,$0D,D_RIGHT db $FF -LoadHoppingShadowOAM: ; 1a6f0 (6:66f0) +LoadHoppingShadowOAM: ld hl, vChars1 + $7f0 ld de, LedgeHoppingShadow lb bc, BANK(LedgeHoppingShadow), (LedgeHoppingShadowEnd - LedgeHoppingShadow) / $8 @@ -77,10 +77,10 @@ LoadHoppingShadowOAM: ; 1a6f0 (6:66f0) call WriteOAMBlock ret -LedgeHoppingShadow: ; 1a708 (6:6708) +LedgeHoppingShadow: INCBIN "gfx/ledge_hopping_shadow.1bpp" LedgeHoppingShadowEnd: -LedgeHoppingShadowOAM: ; 1a710 (6:6710) +LedgeHoppingShadowOAM: db $FF,$10,$FF,$20 db $FF,$40,$FF,$60 diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index bdd3320b..05588321 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -8,7 +8,7 @@ ; fields, respectively, within loops. The X is the loop index. ; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y* ; denote fields of the sprite slots interated over in the inner loop. -InitMapSprites: ; 1785b (5:785b) +InitMapSprites: call InitOutsideMapSprites ret c ; return if the map is an outside map (already handled by above call) ; if the map is an inside map (i.e. mapID >= $25) @@ -29,7 +29,7 @@ InitMapSprites: ; 1785b (5:785b) ; This is used for both inside and outside maps, since it is called by ; InitOutsideMapSprites. ; Loads tile pattern data for sprites into VRAM. -LoadMapSpriteTilePatterns: ; 17871 (5:7871) +LoadMapSpriteTilePatterns: ld a,[wNumSprites] and a ; are there any sprites? jr nz,.spritesExist @@ -236,7 +236,7 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) ; de = pointer to sprite sheet ; bc = length in bytes ; a = ROM bank -ReadSpriteSheetData: ; 17971 (5:7971) +ReadSpriteSheetData: ld a,[hli] ld e,a ld a,[hli] @@ -250,7 +250,7 @@ ReadSpriteSheetData: ; 17971 (5:7971) ; Loads sprite set for outside maps (cities and routes) and sets VRAM slots. ; sets carry if the map is a city or route, unsets carry if not -InitOutsideMapSprites: ; 1797b (5:797b) +InitOutsideMapSprites: ld a,[wCurMap] cp a,REDS_HOUSE_1F ; is the map a city or a route (map ID less than $25)? ret nc ; if not, return @@ -380,7 +380,7 @@ InitOutsideMapSprites: ; 1797b (5:797b) ; Chooses the correct sprite set ID depending on the player's position within ; the map for maps with two sprite sets. -GetSplitMapSpriteSetID: ; 17a1a (5:7a1a) +GetSplitMapSpriteSetID: cp a,$f8 jr z,.route20 ld hl,SplitMapSpriteSets diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 2af2e518..e60f820a 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -1,4 +1,4 @@ -UpdatePlayerSprite: ; 4e31 (1:4e31) +UpdatePlayerSprite: ld a, [wSpriteStateData2] and a jr z, .checkIfTextBoxInFrontOfSprite @@ -98,7 +98,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31) ld [wSpriteStateData2 + 7], a ret -UnusedReadSpriteDataFunction: ; 4ec7 (1:4ec7) +UnusedReadSpriteDataFunction: push bc push af ld a, [H_CURRENTSPRITEOFFSET] @@ -109,7 +109,7 @@ UnusedReadSpriteDataFunction: ; 4ec7 (1:4ec7) pop bc ret -UpdateNPCSprite: ; 4ed1 (1:4ed1) +UpdateNPCSprite: ld a, [H_CURRENTSPRITEOFFSET] swap a dec a @@ -249,7 +249,7 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) jr TryWalking ; changes facing direction by zeroing the movement delta and calling TryWalking -ChangeFacingDirection: ; 4fc8 (1:4fc8) +ChangeFacingDirection: ld de, $0 ; fall through @@ -259,7 +259,7 @@ ChangeFacingDirection: ; 4fc8 (1:4fc8) ; e: X movement delta (-1, 0 or 1) ; hl: pointer to tile the sprite would walk onto ; set carry on failure, clears carry on success -TryWalking: ; 4fcb (1:4fcb) +TryWalking: push hl ld h, $c1 ld a, [H_CURRENTSPRITEOFFSET] @@ -298,7 +298,7 @@ TryWalking: ; 4fcb (1:4fcb) jp UpdateSpriteImage ; update the walking animation parameters for a sprite that is currently walking -UpdateSpriteInWalkingAnimation: ; 4ffe (1:4ffe) +UpdateSpriteInWalkingAnimation: ld a, [H_CURRENTSPRITEOFFSET] add $7 ld l, a @@ -371,7 +371,7 @@ UpdateSpriteInWalkingAnimation: ; 4ffe (1:4ffe) ret ; update delay value (c2x8) for sprites in the delayed state (c1x1) -UpdateSpriteMovementDelay: ; 5057 (1:5057) +UpdateSpriteMovementDelay: ld h, $c2 ld a, [H_CURRENTSPRITEOFFSET] add $6 @@ -392,7 +392,7 @@ UpdateSpriteMovementDelay: ; 5057 (1:5057) inc a ld l, a ld [hl], $1 ; c1x1 = 1 (mark as ready to move) -notYetMoving: ; 5073 (1:5073) +notYetMoving: ld h, $c1 ld a, [H_CURRENTSPRITEOFFSET] add $8 @@ -400,7 +400,7 @@ notYetMoving: ; 5073 (1:5073) ld [hl], $0 ; c1x8 = 0 (walk animation frame) jp UpdateSpriteImage -MakeNPCFacePlayer: ; 507f (1:507f) +MakeNPCFacePlayer: ; Make an NPC face the player if the player has spoken to him or her. ; Check if the behaviour of the NPC facing the player when spoken to is @@ -434,7 +434,7 @@ MakeNPCFacePlayer: ; 507f (1:507f) ld [hl], c ; c1x9: set facing direction jr notYetMoving -InitializeSpriteStatus: ; 50ad (1:50ad) +InitializeSpriteStatus: ld [hl], $1 ; $c1x1: set movement status to ready inc l ld [hl], $ff ; $c1x2: set sprite image to $ff (invisible/off screen) @@ -448,7 +448,7 @@ InitializeSpriteStatus: ; 50ad (1:50ad) ret ; calculates the spprite's scrren position form its map position and the player position -InitializeSpriteScreenPosition: ; 50bd (1:50bd) +InitializeSpriteScreenPosition: ld h, $c2 ld a, [H_CURRENTSPRITEOFFSET] add $4 @@ -472,7 +472,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd) ret ; tests if sprite is off screen or otherwise unable to do anything -CheckSpriteAvailability: ; 50dc (1:50dc) +CheckSpriteAvailability: predef IsObjectHidden ld a, [$ffe5] and a @@ -553,7 +553,7 @@ CheckSpriteAvailability: ; 50dc (1:50dc) .done ret -UpdateSpriteImage: ; 5157 (1:5157) +UpdateSpriteImage: ld h, $c1 ld a, [H_CURRENTSPRITEOFFSET] add $8 @@ -578,7 +578,7 @@ UpdateSpriteImage: ; 5157 (1:5157) ; d: Y movement delta (-1, 0 or 1) ; e: X movement delta (-1, 0 or 1) ; set carry on failure, clears carry on success -CanWalkOntoTile: ; 516e (1:516e) +CanWalkOntoTile: ld h, $c2 ld a, [H_CURRENTSPRITEOFFSET] add $6 @@ -689,7 +689,7 @@ CanWalkOntoTile: ; 516e (1:516e) ; calculates the tile pointer pointing to the tile the current sprite stancs on ; this is always the lower left tile of the 2x2 tile blocks all sprites are snapped to ; hl: output pointer -GetTileSpriteStandsOn: ; 5207 (1:5207) +GetTileSpriteStandsOn: ld h, $c1 ld a, [H_CURRENTSPRITEOFFSET] add $4 @@ -718,7 +718,7 @@ GetTileSpriteStandsOn: ; 5207 (1:5207) ret ; loads [de+a] into a -LoadDEPlusA: ; 522f (1:522f) +LoadDEPlusA: add e ld e, a jr nc, .noCarry @@ -727,7 +727,7 @@ LoadDEPlusA: ; 522f (1:522f) ld a, [de] ret -DoScriptedNPCMovement: ; 5236 (1:5236) +DoScriptedNPCMovement: ; This is an alternative method of scripting an NPC's movement and is only used ; a few times in the game. It is used when the NPC and player must walk together ; in sync, such as when the player is following the NPC somewhere. An NPC can't @@ -798,23 +798,23 @@ DoScriptedNPCMovement: ; 5236 (1:5236) inc [hl] ret -InitScriptedNPCMovement: ; 52a6 (1:52a6) +InitScriptedNPCMovement: xor a ld [wNPCMovementDirections2Index], a ld a, 8 ld [wScriptedNPCWalkCounter], a jp AnimScriptedNPCMovement -GetSpriteScreenYPointer: ; 52b2 (1:52b2) +GetSpriteScreenYPointer: ld a, $4 ld b, a jr GetSpriteScreenXYPointerCommon -GetSpriteScreenXPointer: ; 52b7 (1:52b7) +GetSpriteScreenXPointer: ld a, $6 ld b, a -GetSpriteScreenXYPointerCommon: ; 52ba (1:52ba) +GetSpriteScreenXYPointerCommon: ld hl, wSpriteStateData1 ld a, [H_CURRENTSPRITEOFFSET] add l @@ -822,7 +822,7 @@ GetSpriteScreenXYPointerCommon: ; 52ba (1:52ba) ld l, a ret -AnimScriptedNPCMovement: ; 52c3 (1:52c3) +AnimScriptedNPCMovement: ld hl, wSpriteStateData2 ld a, [H_CURRENTSPRITEOFFSET] add $e @@ -861,7 +861,7 @@ AnimScriptedNPCMovement: ; 52c3 (1:52c3) ld [hl], a ret -AdvanceScriptedNPCAnimFrameCounter: ; 5301 (1:5301) +AdvanceScriptedNPCAnimFrameCounter: ld a, [H_CURRENTSPRITEOFFSET] add $7 ld l, a diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 719c8835..98d1b7a7 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -1,4 +1,4 @@ -PlayerStepOutFromDoor: ; 1a3e0 (6:63e0) +PlayerStepOutFromDoor: ld hl, wd730 res 1, [hl] call IsPlayerStandingOnDoorTile @@ -27,7 +27,7 @@ PlayerStepOutFromDoor: ; 1a3e0 (6:63e0) res 7, [hl] ret -_EndNPCMovementScript: ; 1a41d (6:641d) +_EndNPCMovementScript: ld hl, wd730 res 7, [hl] ld hl, wd72e @@ -44,14 +44,14 @@ _EndNPCMovementScript: ; 1a41d (6:641d) ld [wSimulatedJoypadStatesEnd], a ret -PalletMovementScriptPointerTable: ; 1a442 (6:6442) +PalletMovementScriptPointerTable: dw PalletMovementScript_OakMoveLeft dw PalletMovementScript_PlayerMoveLeft dw PalletMovementScript_WaitAndWalkToLab dw PalletMovementScript_WalkToLab dw PalletMovementScript_Done -PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c) +PalletMovementScript_OakMoveLeft: ld a, [wXCoord] sub $a ld [wNumStepsToTake], a @@ -85,7 +85,7 @@ PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c) ld [wJoyIgnore], a ret -PalletMovementScript_PlayerMoveLeft: ; 1a485 (6:6485) +PalletMovementScript_PlayerMoveLeft: ld a, [wd730] bit 0, a ; is an NPC being moved by a script? ret nz ; return if Oak is still moving @@ -98,12 +98,12 @@ PalletMovementScript_PlayerMoveLeft: ; 1a485 (6:6485) ld [wNPCMovementScriptFunctionNum], a ret -PalletMovementScript_WaitAndWalkToLab: ; 1a4a1 (6:64a1) +PalletMovementScript_WaitAndWalkToLab: ld a, [wSimulatedJoypadStatesIndex] and a ; is the player done moving left yet? ret nz -PalletMovementScript_WalkToLab: ; 1a4a6 (6:64a6) +PalletMovementScript_WalkToLab: xor a ld [wOverrideSimulatedJoypadStatesMask], a ld a, [wSpriteIndex] @@ -127,7 +127,7 @@ PalletMovementScript_WalkToLab: ; 1a4a6 (6:64a6) ld [wNPCMovementScriptFunctionNum], a ret -RLEList_ProfOakWalkToLab: ; 1a4dc (6:64dc) +RLEList_ProfOakWalkToLab: db NPC_MOVEMENT_DOWN, $05 db NPC_MOVEMENT_LEFT, $01 db NPC_MOVEMENT_DOWN, $05 @@ -136,7 +136,7 @@ RLEList_ProfOakWalkToLab: ; 1a4dc (6:64dc) db $E0, $01 ; stand still db $FF -RLEList_PlayerWalkToLab: ; 1a4e9 (6:64e9) +RLEList_PlayerWalkToLab: db D_UP, $02 db D_RIGHT, $03 db D_DOWN, $05 @@ -144,7 +144,7 @@ RLEList_PlayerWalkToLab: ; 1a4e9 (6:64e9) db D_DOWN, $06 db $FF -PalletMovementScript_Done: ; 1a4f4 (6:64f4) +PalletMovementScript_Done: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -157,11 +157,11 @@ PalletMovementScript_Done: ; 1a4f4 (6:64f4) res 7, [hl] jp EndNPCMovementScript -PewterMuseumGuyMovementScriptPointerTable: ; 1a510 (6:6510) +PewterMuseumGuyMovementScriptPointerTable: dw PewterMovementScript_WalkToMuseum dw PewterMovementScript_Done -PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514) +PewterMovementScript_WalkToMuseum: ld a, BANK(Music_MuseumGuy) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a @@ -189,21 +189,21 @@ PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514) ld [wNPCMovementScriptFunctionNum], a ret -RLEList_PewterMuseumPlayer: ; 1a559 (6:6559) +RLEList_PewterMuseumPlayer: db 0, $01 db D_UP, $03 db D_LEFT, $0D db D_UP, $06 db $FF -RLEList_PewterMuseumGuy: ; 1a562 (6:6562) +RLEList_PewterMuseumGuy: db NPC_MOVEMENT_UP, $06 db NPC_MOVEMENT_LEFT, $0D db NPC_MOVEMENT_UP, $03 db NPC_MOVEMENT_LEFT, $01 db $FF -PewterMovementScript_Done: ; 1a56b (6:656b) +PewterMovementScript_Done: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -213,11 +213,11 @@ PewterMovementScript_Done: ; 1a56b (6:656b) res 7, [hl] jp EndNPCMovementScript -PewterGymGuyMovementScriptPointerTable: ; 1a57d (6:657d) +PewterGymGuyMovementScriptPointerTable: dw PewterMovementScript_WalkToGym dw PewterMovementScript_Done -PewterMovementScript_WalkToGym: ; 1a581 (6:6581) +PewterMovementScript_WalkToGym: ld a, BANK(Music_MuseumGuy) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a @@ -248,7 +248,7 @@ PewterMovementScript_WalkToGym: ; 1a581 (6:6581) ld [wNPCMovementScriptFunctionNum], a ret -RLEList_PewterGymPlayer: ; 1a5cd (6:65cd) +RLEList_PewterGymPlayer: db 0, $01 db D_RIGHT, $02 db D_DOWN, $05 @@ -257,7 +257,7 @@ RLEList_PewterGymPlayer: ; 1a5cd (6:65cd) db D_LEFT, $0F db $FF -RLEList_PewterGymGuy: ; 1a5da (6:65da) +RLEList_PewterGymGuy: db NPC_MOVEMENT_DOWN, $02 db NPC_MOVEMENT_LEFT, $0F db NPC_MOVEMENT_UP, $05 @@ -266,7 +266,7 @@ RLEList_PewterGymGuy: ; 1a5da (6:65da) db NPC_MOVEMENT_RIGHT, $03 db $FF -FreezeEnemyTrainerSprite: ; 1a5e7 (6:65e7) +FreezeEnemyTrainerSprite: ld a, [wCurMap] cp POKEMONTOWER_7 ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them @@ -285,7 +285,7 @@ FreezeEnemyTrainerSprite: ; 1a5e7 (6:65e7) ld [H_SPRITEINDEX], a jp SetSpriteMovementBytesToFF -RivalIDs: ; 1a605 (6:6605) +RivalIDs: db OPP_SONY1 db OPP_SONY2 db OPP_SONY3 diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm index 8ac456d2..d73174c4 100755 --- a/engine/overworld/oaks_aide.asm +++ b/engine/overworld/oaks_aide.asm @@ -45,27 +45,27 @@ OaksAideScript: ; 0x59035 ld [hOaksAideResult], a ret -OaksAideHiText: ; 59091 (16:5091) +OaksAideHiText: TX_FAR _OaksAideHiText db "@" -OaksAideUhOhText: ; 59096 (16:5096) +OaksAideUhOhText: TX_FAR _OaksAideUhOhText db "@" -OaksAideComeBackText: ; 5909b (16:509b) +OaksAideComeBackText: TX_FAR _OaksAideComeBackText db "@" -OaksAideHereYouGoText: ; 590a0 (16:50a0) +OaksAideHereYouGoText: TX_FAR _OaksAideHereYouGoText db "@" -OaksAideGotItemText: ; 590a5 (16:50a5) +OaksAideGotItemText: TX_FAR _OaksAideGotItemText db $0b db "@" -OaksAideNoRoomText: ; 590ab (16:50ab) +OaksAideNoRoomText: TX_FAR _OaksAideNoRoomText db "@" diff --git a/engine/overworld/oam.asm b/engine/overworld/oam.asm index 41360965..94082beb 100644 --- a/engine/overworld/oam.asm +++ b/engine/overworld/oam.asm @@ -166,7 +166,7 @@ PrepareOAMData: add hl, de jr .clear -GetSpriteScreenXY: ; 4bd1 (1:4bd1) +GetSpriteScreenXY: inc e inc e ld a, [de] ; c1x4 diff --git a/engine/overworld/pewter_guys.asm b/engine/overworld/pewter_guys.asm index 543dac91..532fa4bf 100755 --- a/engine/overworld/pewter_guys.asm +++ b/engine/overworld/pewter_guys.asm @@ -1,4 +1,4 @@ -PewterGuys: ; 37ca1 (d:7ca1) +PewterGuys: ld hl, wSimulatedJoypadStatesEnd ld a, [wSimulatedJoypadStatesIndex] dec a ; this decrement causes it to overwrite the last byte before $FF in the list @@ -48,14 +48,14 @@ PewterGuys: ; 37ca1 (d:7ca1) inc hl jr .findMatchingCoordsLoop -PointerTable_37ce6: ; 37ce6 (d:7ce6) +PointerTable_37ce6: dw PewterMuseumGuyCoords dw PewterGymGuyCoords ; these are the four coordinates of the spaces below, above, to the left and ; to the right of the museum guy, and pointers to different movements for ; the player to make to get positioned before the main movement. -PewterMuseumGuyCoords: ; 37cea (d:7cea) +PewterMuseumGuyCoords: db 18, 27 dw .down db 16, 27 @@ -78,7 +78,7 @@ PewterMuseumGuyCoords: ; 37cea (d:7cea) ; different movements for the player to make to get positioned before the ; main movement ; $00 is a pause -PewterGymGuyCoords: ; 37d06 (d:7d06) +PewterGymGuyCoords: db 16, 34 dw .one db 17, 35 diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index de36eeaf..f7b63aaa 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -1,4 +1,4 @@ -EnterMapAnim: ; 70510 (1c:4510) +EnterMapAnim: call InitFacingDirectionList ld a, $ec ld [wSpriteStateData1 + 4], a ; player's sprite Y screen position @@ -63,7 +63,7 @@ EnterMapAnim: ; 70510 (1c:4510) call LoadPlayerSpriteGraphics jr .restoreDefaultMusic -FlyAnimationEnterScreenCoords: ; 70592 (1c:4592) +FlyAnimationEnterScreenCoords: ; y, x pairs ; This is the sequence of screen coordinates used by the overworld ; Fly animation when the player is entering a map. @@ -80,7 +80,7 @@ FlyAnimationEnterScreenCoords: ; 70592 (1c:4592) db $3C, $48 db $3C, $40 -PlayerSpinWhileMovingDown: ; 705aa (1c:45aa) +PlayerSpinWhileMovingDown: ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY ld a, $10 ld [hli], a ; wPlayerSpinWhileMovingUpOrDownAnimDeltaY @@ -90,7 +90,7 @@ PlayerSpinWhileMovingDown: ; 705aa (1c:45aa) ld [hl], a ; wPlayerSpinWhileMovingUpOrDownAnimFrameDelay jp PlayerSpinWhileMovingUpOrDown -_LeaveMapAnim: ; 705ba (1c:45ba) +_LeaveMapAnim: call InitFacingDirectionList call IsPlayerStandingOnWarpPadOrHole ld a, b @@ -167,7 +167,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) call GBFadeOutToWhite jp RestoreFacingDirectionAndYScreenPos -FlyAnimationScreenCoords1: ; 7064f (1c:464f) +FlyAnimationScreenCoords1: ; y, x pairs ; This is the sequence of screen coordinates used by the first part ; of the Fly overworld animation. @@ -184,7 +184,7 @@ FlyAnimationScreenCoords1: ; 7064f (1c:464f) db $2A, $98 db $27, $A0 -FlyAnimationScreenCoords2: ; 70667 (1c:4667) +FlyAnimationScreenCoords2: ; y, x pairs ; This is the sequence of screen coordinates used by the second part ; of the Fly overworld animation. @@ -201,7 +201,7 @@ FlyAnimationScreenCoords2: ; 70667 (1c:4667) db $F0, $00 -LeaveMapThroughHoleAnim: ; 7067d (1c:467d) +LeaveMapThroughHoleAnim: ld a, $ff ld [wUpdateSpritesEnabled], a ; disable UpdateSprites ; shift upper half of player's sprite down 8 pixels and hide lower half @@ -223,7 +223,7 @@ LeaveMapThroughHoleAnim: ; 7067d (1c:467d) ld [wUpdateSpritesEnabled], a ; enable UpdateSprites jp RestoreFacingDirectionAndYScreenPos -DoFlyAnimation: ; 706ae (1c:46ae) +DoFlyAnimation: ld a, [wFlyAnimBirdSpriteImageIndex] xor $1 ; make the bird flap its wings ld [wFlyAnimBirdSpriteImageIndex], a @@ -247,7 +247,7 @@ DoFlyAnimation: ; 706ae (1c:46ae) jr nz, DoFlyAnimation ret -LoadBirdSpriteGraphics: ; 706d7 (1c:46d7) +LoadBirdSpriteGraphics: ld de, BirdSprite ld hl, vNPCSprites lb bc, BANK(BirdSprite), $0c @@ -257,7 +257,7 @@ LoadBirdSpriteGraphics: ; 706d7 (1c:46d7) lb bc, BANK(BirdSprite), $0c jp CopyVideoData -InitFacingDirectionList: ; 706ef (1c:46ef) +InitFacingDirectionList: ld a, [wSpriteStateData1 + 2] ; player's sprite facing direction (image index is locked to standing images) ld [wSavedPlayerFacingDirection], a ld a, [wSpriteStateData1 + 4] ; player's sprite Y screen position @@ -276,12 +276,12 @@ InitFacingDirectionList: ; 706ef (1c:46ef) dec hl ret -PlayerSpinningFacingOrder: ; 70713 (1c:4713) +PlayerSpinningFacingOrder: ; The order of the direction the player's sprite is facing when teleporting ; away. Creates a spinning effect. db SPRITE_FACING_DOWN, SPRITE_FACING_LEFT, SPRITE_FACING_UP, SPRITE_FACING_RIGHT -SpinPlayerSprite: ; 70717 (1c:4717) +SpinPlayerSprite: ; copy the current value from the list into the sprite data and rotate the list ld a, [hl] ld [wSpriteStateData1 + 2], a ; player's sprite facing direction (image index is locked to standing images) @@ -295,7 +295,7 @@ SpinPlayerSprite: ; 70717 (1c:4717) pop hl ret -PlayerSpinInPlace: ; 70730 (1c:4730) +PlayerSpinInPlace: call SpinPlayerSprite ld a, [wPlayerSpinInPlaceAnimFrameDelay] ld c, a @@ -316,7 +316,7 @@ PlayerSpinInPlace: ; 70730 (1c:4730) call DelayFrames jr PlayerSpinInPlace -PlayerSpinWhileMovingUpOrDown: ; 70755 (1c:4755) +PlayerSpinWhileMovingUpOrDown: call SpinPlayerSprite ld a, [wPlayerSpinWhileMovingUpOrDownAnimDeltaY] ld c, a @@ -332,7 +332,7 @@ PlayerSpinWhileMovingUpOrDown: ; 70755 (1c:4755) call DelayFrames jr PlayerSpinWhileMovingUpOrDown -RestoreFacingDirectionAndYScreenPos: ; 70772 (1c:4772) +RestoreFacingDirectionAndYScreenPos: ld a, [wSavedPlayerScreenY] ld [wSpriteStateData1 + 4], a ld a, [wSavedPlayerFacingDirection] @@ -340,14 +340,14 @@ RestoreFacingDirectionAndYScreenPos: ; 70772 (1c:4772) ret ; if SGB, 2 frames, else 3 frames -GetPlayerTeleportAnimFrameDelay: ; 7077f (1c:477f) +GetPlayerTeleportAnimFrameDelay: ld a, [wOnSGB] xor $1 inc a inc a ret -IsPlayerStandingOnWarpPadOrHole: ; 70787 (1c:4787) +IsPlayerStandingOnWarpPadOrHole: ld b, 0 ld hl, .warpPadAndHoleData ld a, [wCurMapTileset] @@ -374,14 +374,14 @@ IsPlayerStandingOnWarpPadOrHole: ; 70787 (1c:4787) ret ; format: db tileset id, tile id, value to be put in [wStandingOnWarpPadOrHole] -.warpPadAndHoleData: ; 707a9 (1c:47a9) +.warpPadAndHoleData: db FACILITY, $20, 1 ; warp pad db FACILITY, $11, 2 ; hole db CAVERN, $22, 2 ; hole db INTERIOR, $55, 1 ; warp pad db $FF -FishingAnim: ; 707b6 (1c:47b6) +FishingAnim: ld c, 10 call DelayFrames ld hl, wd736 @@ -462,19 +462,19 @@ FishingAnim: ; 707b6 (1c:47b6) ld [hl], a ret -NoNibbleText: ; 70847 (1c:4847) +NoNibbleText: TX_FAR _NoNibbleText db "@" -NothingHereText: ; 7084c (1c:484c) +NothingHereText: TX_FAR _NothingHereText db "@" -ItsABiteText: ; 70851 (1c:4851) +ItsABiteText: TX_FAR _ItsABiteText db "@" -FishingRodOAM: ; 70856 (1c:4856) +FishingRodOAM: ; specifies how the fishing rod should be drawn on the screen ; first byte = screen y coordinate ; second byte = screen x coordinate @@ -485,7 +485,7 @@ FishingRodOAM: ; 70856 (1c:4856) db $50, $40, $FE, $00 ; player facing left db $50, $58, $FE, $20 ; player facing right ($20 means "horizontally flip the tile") -RedFishingTiles: ; 70866 (1c:4866) +RedFishingTiles: dw RedFishingTilesFront db 2, BANK(RedFishingTilesFront) dw vNPCSprites + $20 @@ -502,7 +502,7 @@ RedFishingTiles: ; 70866 (1c:4866) db 3, BANK(RedFishingRodTiles) dw vNPCSprites2 + $7d0 -_HandleMidJump: ; 7087e (1c:487e) +_HandleMidJump: ld a, [wPlayerJumpingYScreenCoordsIndex] ld c, a inc a @@ -534,6 +534,6 @@ _HandleMidJump: ; 7087e (1c:487e) ld [wJoyIgnore], a ret -PlayerJumpingYScreenCoords: ; 708ba (1c:48ba) +PlayerJumpingYScreenCoords: ; Sequence of y screen coordinates for player's sprite when jumping over a ledge. db $38, $36, $34, $32, $31, $30, $30, $30, $31, $32, $33, $34, $36, $38, $3C, $3C diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index f302d994..3a302d70 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -1,4 +1,4 @@ -DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) +DisplayPokemonCenterDialogue_: call SaveScreenTilesToBuffer1 ; save screen ld hl, PokemonCenterWelcomeText call PrintText @@ -45,24 +45,24 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) call PrintText jp UpdateSprites -PokemonCenterWelcomeText: ; 705d (1:705d) +PokemonCenterWelcomeText: TX_FAR _PokemonCenterWelcomeText db "@" -ShallWeHealYourPokemonText: ; 7062 (1:7062) +ShallWeHealYourPokemonText: db $a TX_FAR _ShallWeHealYourPokemonText db "@" -NeedYourPokemonText: ; 7068 (1:7068) +NeedYourPokemonText: TX_FAR _NeedYourPokemonText db "@" -PokemonFightingFitText: ; 706d (1:706d) +PokemonFightingFitText: TX_FAR _PokemonFightingFitText db "@" -PokemonCenterFarewellText: ; 7072 (1:7072) +PokemonCenterFarewellText: db $a TX_FAR _PokemonCenterFarewellText db "@" diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index ae96c4a9..e50c508e 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -1,4 +1,4 @@ -DisplayPokemartDialogue_: ; 6c20 (1:6c20) +DisplayPokemartDialogue_: ld a,[wListScrollOffset] ld [wSavedListScrollOffset],a call UpdateSprites @@ -227,46 +227,46 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld [wListScrollOffset],a ret -PokemartBuyingGreetingText: ; 6e0c (1:6e0c) +PokemartBuyingGreetingText: TX_FAR _PokemartBuyingGreetingText db "@" -PokemartTellBuyPriceText: ; 6e11 (1:6e11) +PokemartTellBuyPriceText: TX_FAR _PokemartTellBuyPriceText db "@" -PokemartBoughtItemText: ; 6e16 (1:6e16) +PokemartBoughtItemText: TX_FAR _PokemartBoughtItemText db "@" -PokemartNotEnoughMoneyText: ; 6e1b (1:6e1b) +PokemartNotEnoughMoneyText: TX_FAR _PokemartNotEnoughMoneyText db "@" -PokemartItemBagFullText: ; 6e20 (1:6e20) +PokemartItemBagFullText: TX_FAR _PokemartItemBagFullText db "@" -PokemonSellingGreetingText: ; 6e25 (1:6e25) +PokemonSellingGreetingText: TX_FAR _PokemonSellingGreetingText db "@" -PokemartTellSellPriceText: ; 6e2a (1:6e2a) +PokemartTellSellPriceText: TX_FAR _PokemartTellSellPriceText db "@" -PokemartItemBagEmptyText: ; 6e2f (1:6e2f) +PokemartItemBagEmptyText: TX_FAR _PokemartItemBagEmptyText db "@" -PokemartUnsellableItemText: ; 6e34 (1:6e34) +PokemartUnsellableItemText: TX_FAR _PokemartUnsellableItemText db "@" -PokemartThankYouText: ; 6e39 (1:6e39) +PokemartThankYouText: TX_FAR _PokemartThankYouText db "@" -PokemartAnythingElseText: ; 6e3e (1:6e3e) +PokemartAnythingElseText: TX_FAR _PokemartAnythingElseText db "@" diff --git a/engine/overworld/saffron_guards.asm b/engine/overworld/saffron_guards.asm index c0d6a985..3b26b6f8 100755 --- a/engine/overworld/saffron_guards.asm +++ b/engine/overworld/saffron_guards.asm @@ -1,4 +1,4 @@ -RemoveGuardDrink: ; 5a59f (16:659f) +RemoveGuardDrink: ld hl, GuardDrinksList .drinkLoop ld a, [hli] @@ -12,5 +12,5 @@ RemoveGuardDrink: ; 5a59f (16:659f) jr z, .drinkLoop jpba RemoveItemByID -GuardDrinksList: ; 5a5b7 (16:65b7) +GuardDrinksList: db FRESH_WATER, SODA_POP, LEMONADE, $00 diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm index e631bbfa..712c53ed 100755 --- a/engine/overworld/ssanne.asm +++ b/engine/overworld/ssanne.asm @@ -1,4 +1,4 @@ -AnimateBoulderDust: ; 79f54 (1e:5f54) +AnimateBoulderDust: ld a, $1 ld [wWhichAnimationOffsets], a ; select the boulder dust offsets ld a, [wUpdateSpritesEnabled] @@ -29,7 +29,7 @@ AnimateBoulderDust: ; 79f54 (1e:5f54) ld [wUpdateSpritesEnabled], a jp LoadPlayerSpriteGraphics -GetMoveBoulderDustFunctionPointer: ; 79f92 (1e:5f92) +GetMoveBoulderDustFunctionPointer: ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction ld hl, MoveBoulderDustFunctionPointerTable ld c, a @@ -51,7 +51,7 @@ GetMoveBoulderDustFunctionPointer: ; 79f92 (1e:5f92) pop hl ret -MoveBoulderDustFunctionPointerTable: ; 79fb0 (1e:5fb0) +MoveBoulderDustFunctionPointerTable: ; facing down db $FF,$00 dw AdjustOAMBlockYPos @@ -68,7 +68,7 @@ MoveBoulderDustFunctionPointerTable: ; 79fb0 (1e:5fb0) db $FF,$01 dw AdjustOAMBlockXPos -LoadSmokeTileFourTimes: ; 79fc0 (1e:5fc0) +LoadSmokeTileFourTimes: ld hl, vChars1 + $7c0 ld c, $4 .loop @@ -83,11 +83,11 @@ LoadSmokeTileFourTimes: ; 79fc0 (1e:5fc0) jr nz, .loop ret -LoadSmokeTile: ; 79fd4 (1e:5fd4) +LoadSmokeTile: ld de, SSAnneSmokePuffTile lb bc, BANK(SSAnneSmokePuffTile), (SSAnneSmokePuffTileEnd - SSAnneSmokePuffTile) / $10 jp CopyVideoData -SSAnneSmokePuffTile: ; 79fdd (1e:5fdd) +SSAnneSmokePuffTile: INCBIN "gfx/ss_anne_smoke_puff.2bpp" SSAnneSmokePuffTileEnd: diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm index 66ae20ce..1d0340c9 100755 --- a/engine/overworld/trainers.asm +++ b/engine/overworld/trainers.asm @@ -1,4 +1,4 @@ -_GetSpritePosition1: ; 567f9 (15:67f9) +_GetSpritePosition1: ld hl, wSpriteStateData1 ld de, $4 ld a, [wSpriteIndex] @@ -17,7 +17,7 @@ _GetSpritePosition1: ; 567f9 (15:67f9) ld [$ffee], a ret -_GetSpritePosition2: ; 56819 (15:6819) +_GetSpritePosition2: ld hl, wSpriteStateData1 ld de, $4 ld a, [wSpriteIndex] @@ -36,7 +36,7 @@ _GetSpritePosition2: ; 56819 (15:6819) ld [wSavedSpriteMapX], a ret -_SetSpritePosition1: ; 5683d (15:683d) +_SetSpritePosition1: ld hl, wSpriteStateData1 ld de, $4 ld a, [wSpriteIndex] @@ -55,7 +55,7 @@ _SetSpritePosition1: ; 5683d (15:683d) ld [hl], a ret -_SetSpritePosition2: ; 5685d (15:685d) +_SetSpritePosition2: ld hl, wSpriteStateData1 ld de, $0004 ld a, [wSpriteIndex] @@ -74,7 +74,7 @@ _SetSpritePosition2: ; 5685d (15:685d) ld [hl], a ret -TrainerWalkUpToPlayer: ; 56881 (15:6881) +TrainerWalkUpToPlayer: ld a, [wSpriteIndex] swap a ld [wTrainerSpriteOffset], a @@ -149,7 +149,7 @@ TrainerWalkUpToPlayer: ; 56881 (15:6881) ; input: de = offset within sprite entry ; output: de = pointer to sprite data -GetSpriteDataPointer: ; 56903 (15:6903) +GetSpriteDataPointer: push de add hl, de ld a, [H_SPRITEINDEX] @@ -161,7 +161,7 @@ GetSpriteDataPointer: ; 56903 (15:6903) ret ; tests if this trainer is in the right position to engage the player and do so if she is. -TrainerEngage: ; 5690f (15:690f) +TrainerEngage: push hl push de ld a, [wTrainerSpriteOffset] @@ -225,14 +225,14 @@ TrainerEngage: ; 5690f (15:690f) set 0, [hl] call EngageMapTrainer ld a, $ff -.noEngage: ; 56988 (15:6988) +.noEngage: ld [wTrainerSpriteOffset], a pop de pop hl ret ; reads trainer's Y position to wTrainerScreenY and X position to wTrainerScreenX -ReadTrainerScreenPosition: ; 5698e (15:698e) +ReadTrainerScreenPosition: ld a, [wTrainerSpriteOffset] add $4 ld d, $0 @@ -254,7 +254,7 @@ ReadTrainerScreenPosition: ; 5698e (15:698e) ; checks if the sprite is properly lined up with the player with respect to the direction it's looking. Also checks the distance between player and sprite ; note that this does not necessarily mean the sprite is seeing the player, he could be behind it's back ; a: distance player to sprite -CheckSpriteCanSeePlayer: ; 569af (15:69af) +CheckSpriteCanSeePlayer: ld b, a ld a, [wTrainerEngageDistance] ; how far the trainer can see cp b @@ -290,7 +290,7 @@ CheckSpriteCanSeePlayer: ; 569af (15:69af) ret ; tests if the player is in front of the sprite (rather than behind it) -CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3) +CheckPlayerIsInFrontOfSprite: ld a, [wCurMap] cp POWER_PLANT jp z, .engage ; bypass this for power plant to get voltorb fake items to work diff --git a/engine/palettes.asm b/engine/palettes.asm index 94466533..4785ade2 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -1,4 +1,4 @@ -_RunPaletteCommand: ; 71ddf (1c:5ddf) +_RunPaletteCommand: call GetPredefRegisters ld a, b cp $ff @@ -19,13 +19,13 @@ _RunPaletteCommand: ; 71ddf (1c:5ddf) push de jp [hl] -SetPal_BattleBlack: ; 71dff (1c:5dff) +SetPal_BattleBlack: ld hl, PalPacket_Black ld de, BlkPacket_Battle ret ; uses PalPacket_Empty to build a packet based on mon IDs and health color -SetPal_Battle: ; 71e06 (1c:5e06) +SetPal_Battle: ld hl, PalPacket_Empty ld de, wPalPacket ld bc, $10 @@ -58,13 +58,13 @@ SetPal_Battle: ; 71e06 (1c:5e06) ld [wDefaultPaletteCommand], a ret -SetPal_TownMap: ; 71e48 (1c:5e48) +SetPal_TownMap: ld hl, PalPacket_TownMap ld de, BlkPacket_WholeScreen ret ; uses PalPacket_Empty to build a packet based the mon ID -SetPal_StatusScreen: ; 71e4f (1c:5e4f) +SetPal_StatusScreen: ld hl, PalPacket_Empty ld de, wPalPacket ld bc, $10 @@ -87,12 +87,12 @@ SetPal_StatusScreen: ; 71e4f (1c:5e4f) ld de, BlkPacket_StatusScreen ret -SetPal_PartyMenu: ; 71e7b (1c:5e7b) +SetPal_PartyMenu: ld hl, PalPacket_PartyMenu ld de, wPartyMenuBlkPacket ret -SetPal_Pokedex: ; 71e82 (1c:5e82) +SetPal_Pokedex: ld hl, PalPacket_Pokedex ld de, wPalPacket ld bc, $10 @@ -105,28 +105,28 @@ SetPal_Pokedex: ; 71e82 (1c:5e82) ld de, BlkPacket_Pokedex ret -SetPal_Slots: ; 71e9f (1c:5e9f) +SetPal_Slots: ld hl, PalPacket_Slots ld de, BlkPacket_Slots ret -SetPal_TitleScreen: ; 71ea6 (1c:5ea6) +SetPal_TitleScreen: ld hl, PalPacket_Titlescreen ld de, BlkPacket_Titlescreen ret ; used mostly for menus and the Oak intro -SetPal_Generic: ; 71ead (1c:5ead) +SetPal_Generic: ld hl, PalPacket_Generic ld de, BlkPacket_WholeScreen ret -SetPal_NidorinoIntro: ; 71eb4 (1c:5eb4) +SetPal_NidorinoIntro: ld hl, PalPacket_NidorinoIntro ld de, BlkPacket_NidorinoIntro ret -SetPal_GameFreakIntro: ; 71ebb (1c:5ebb) +SetPal_GameFreakIntro: ld hl, PalPacket_GameFreakIntro ld de, BlkPacket_GameFreakIntro ld a, SET_PAL_GENERIC @@ -134,7 +134,7 @@ SetPal_GameFreakIntro: ; 71ebb (1c:5ebb) ret ; uses PalPacket_Empty to build a packet based on the current map -SetPal_Overworld: ; 71ec7 (1c:5ec7) +SetPal_Overworld: ld hl, PalPacket_Empty ld de, wPalPacket ld bc, $10 @@ -181,7 +181,7 @@ SetPal_Overworld: ; 71ec7 (1c:5ec7) ; used when a Pokemon is the only thing on the screen ; such as evolution, trading and the Hall of Fame -SetPal_PokemonWholeScreen: ; 71f17 (1c:5f17) +SetPal_PokemonWholeScreen: push bc ld hl, PalPacket_Empty ld de, wPalPacket @@ -200,7 +200,7 @@ SetPal_PokemonWholeScreen: ; 71f17 (1c:5f17) ld de, BlkPacket_WholeScreen ret -SetPal_TrainerCard: ; 71f3b (1c:5f3b) +SetPal_TrainerCard: ld hl, BlkPacket_TrainerCard ld de, wTrainerCardBlkPacket ld bc, $40 @@ -240,7 +240,7 @@ SetPal_TrainerCard: ; 71f3b (1c:5f3b) ld de, wTrainerCardBlkPacket ret -SetPalFunctions: ; 71f73 (1c:5f73) +SetPalFunctions: dw SetPal_BattleBlack dw SetPal_Battle dw SetPal_TownMap @@ -258,7 +258,7 @@ SetPalFunctions: ; 71f73 (1c:5f73) ; The length of the blk data of each badge on the Trainer Card. ; The Rainbow Badge has 3 entries because of its many colors. -BadgeBlkDataLengths: ; 71f8f (1c:5f8f) +BadgeBlkDataLengths: db 6 ; Boulder Badge db 6 ; Cascade Badge db 6 ; Thunder Badge @@ -268,12 +268,12 @@ BadgeBlkDataLengths: ; 71f8f (1c:5f8f) db 6 ; Volcano Badge db 6 ; Earth Badge -DeterminePaletteID: ; 71f97 (1c:5f97) +DeterminePaletteID: bit Transformed, a ; a is battle status 3 ld a, PAL_GREYMON ; if the mon has used Transform, use Ditto's palette ret nz ld a, [hl] -DeterminePaletteIDOutOfBattle: ; 71f9d (1c:5f9d) +DeterminePaletteIDOutOfBattle: ld [wd11e], a and a ; is the mon index 0? jr z, .skipDexNumConversion @@ -289,13 +289,13 @@ DeterminePaletteIDOutOfBattle: ; 71f9d (1c:5f9d) ld a, [hl] ret -InitPartyMenuBlkPacket: ; 71fb6 (1c:5fb6) +InitPartyMenuBlkPacket: ld hl, BlkPacket_PartyMenu ld de, wPartyMenuBlkPacket ld bc, $30 jp CopyData -UpdatePartyMenuBlkPacket: ; 71fc2 (1c:5fc2) +UpdatePartyMenuBlkPacket: ; Update the blk packet with the palette of the HP bar that is ; specified in [wWhichPartyMenuHPBar]. ld hl, wPartyMenuHPBarColors @@ -323,7 +323,7 @@ UpdatePartyMenuBlkPacket: ; 71fc2 (1c:5fc2) ld [hl], e ret -SendSGBPacket: ; 71feb (1c:5feb) +SendSGBPacket: ;check number of packets ld a,[hl] and a,$07 @@ -388,7 +388,7 @@ SendSGBPacket: ; 71feb (1c:5feb) ; else send 16 more bytes jr .loop2 -LoadSGB: ; 7202b (1c:602b) +LoadSGB: xor a ld [wOnSGB], a call CheckSGB @@ -422,7 +422,7 @@ LoadSGB: ; 7202b (1c:602b) ld hl, MaskEnCancelPacket jp SendSGBPacket -PrepareSuperNintendoVRAMTransfer: ; 72075 (1c:6075) +PrepareSuperNintendoVRAMTransfer: ld hl, .packetPointers ld c, 9 .loop @@ -451,7 +451,7 @@ PrepareSuperNintendoVRAMTransfer: ; 72075 (1c:6075) dw DataSnd_725a8 dw DataSnd_725b8 -CheckSGB: ; 7209b (1c:609b) +CheckSGB: ; Returns whether the game is running on an SGB in carry. ld hl, MltReq2Packet di @@ -503,12 +503,12 @@ CheckSGB: ; 7209b (1c:609b) scf ret -SendMltReq1Packet: ; 72102 (1c:6102) +SendMltReq1Packet: ld hl, MltReq1Packet call SendSGBPacket jp Wait7000 -CopyGfxToSuperNintendoVRAM: ; 7210b (1c:610b) +CopyGfxToSuperNintendoVRAM: di push de call DisableLCD @@ -547,7 +547,7 @@ CopyGfxToSuperNintendoVRAM: ; 7210b (1c:610b) ei ret -Wait7000: ; 7214a (1c:614a) +Wait7000: ; Each loop takes 9 cycles so this routine actually waits 63000 cycles. ld de, 7000 .loop @@ -560,7 +560,7 @@ Wait7000: ; 7214a (1c:614a) jr nz, .loop ret -SendSGBPackets: ; 72156 (1c:6156) +SendSGBPackets: ld a, [wGBC] and a jr z, .notGBC @@ -575,7 +575,7 @@ SendSGBPackets: ; 72156 (1c:6156) pop hl jp SendSGBPacket -InitGBCPalettes: ; 7216d (1c:616d) +InitGBCPalettes: ld a, $80 ; index 0 with auto-increment ld [rBGPI], a inc hl @@ -597,10 +597,10 @@ InitGBCPalettes: ; 7216d (1c:616d) jr nz, .loop ret -EmptyFunc5: ; 72187 (1c:6187) +EmptyFunc5: ret -CopySGBBorderTiles: ; 72188 (1c:6188) +CopySGBBorderTiles: ; SGB tile data is stored in a 4BPP planar format. ; Each tile is 32 bytes. The first 16 bytes contain bit planes 1 and 2, while ; the second 16 bytes contain bit planes 3 and 4. diff --git a/engine/play_time.asm b/engine/play_time.asm index 79deaf5e..a5202cc6 100755 --- a/engine/play_time.asm +++ b/engine/play_time.asm @@ -1,4 +1,4 @@ -TrackPlayTime: ; 18dee (6:4dee) +TrackPlayTime: call CountDownIgnoreInputBitReset ld a, [wd732] bit 0, a @@ -36,7 +36,7 @@ TrackPlayTime: ; 18dee (6:4dee) ld [wPlayTimeMaxed], a ret -CountDownIgnoreInputBitReset: ; 18e36 (6:4e36) +CountDownIgnoreInputBitReset: ld a, [wIgnoreInputCounter] and a jr nz, .asm_18e40 diff --git a/engine/pokedex_rating.asm b/engine/pokedex_rating.asm index 73025f0a..f8e29e5c 100755 --- a/engine/pokedex_rating.asm +++ b/engine/pokedex_rating.asm @@ -1,4 +1,4 @@ -DisplayDexRating: ; 44169 (11:4169) +DisplayDexRating: ld hl, wPokedexSeen ld b, wPokedexSeenEnd - wPokedexSeen call CountSetBits @@ -51,11 +51,11 @@ DisplayDexRating: ; 44169 (11:4169) ld [de], a ret -PokedexRatingText_441cc: ; 441cc (11:41cc) +PokedexRatingText_441cc: TX_FAR _OaksLabText_441cc db "@" -DexRatingsTable: ; 441d1 (11:41d1) +DexRatingsTable: db 10 dw PokedexRatingText_44201 db 20 @@ -89,66 +89,66 @@ DexRatingsTable: ; 441d1 (11:41d1) db 152 dw PokedexRatingText_4424c -PokedexRatingText_44201: ; 44201 (11:4201) +PokedexRatingText_44201: TX_FAR _OaksLabText_44201 db "@" -PokedexRatingText_44206: ; 44206 (11:4206) +PokedexRatingText_44206: TX_FAR _OaksLabText_44206 db "@" -PokedexRatingText_4420b: ; 4420b (11:420b) +PokedexRatingText_4420b: TX_FAR _OaksLabText_4420b db "@" -PokedexRatingText_44210: ; 44210 (11:4210) +PokedexRatingText_44210: TX_FAR _OaksLabText_44210 db "@" -PokedexRatingText_44215: ; 44215 (11:4215) +PokedexRatingText_44215: TX_FAR _OaksLabText_44215 db "@" -PokedexRatingText_4421a: ; 4421a (11:421a) +PokedexRatingText_4421a: TX_FAR _OaksLabText_4421a db "@" -PokedexRatingText_4421f: ; 4421f (11:421f) +PokedexRatingText_4421f: TX_FAR _OaksLabText_4421f db "@" -PokedexRatingText_44224: ; 44224 (11:4224) +PokedexRatingText_44224: TX_FAR _OaksLabText_44224 db "@" -PokedexRatingText_44229: ; 44229 (11:4229) +PokedexRatingText_44229: TX_FAR _OaksLabText_44229 db "@" -PokedexRatingText_4422e: ; 4422e (11:422e) +PokedexRatingText_4422e: TX_FAR _OaksLabText_4422e db "@" -PokedexRatingText_44233: ; 44233 (11:4233) +PokedexRatingText_44233: TX_FAR _OaksLabText_44233 db "@" -PokedexRatingText_44238: ; 44238 (11:4238) +PokedexRatingText_44238: TX_FAR _OaksLabText_44238 db "@" -PokedexRatingText_4423d: ; 4423d (11:423d) +PokedexRatingText_4423d: TX_FAR _OaksLabText_4423d db "@" -PokedexRatingText_44242: ; 44242 (11:4242) +PokedexRatingText_44242: TX_FAR _OaksLabText_44242 db "@" -PokedexRatingText_44247: ; 44247 (11:4247) +PokedexRatingText_44247: TX_FAR _OaksLabText_44247 db "@" -PokedexRatingText_4424c: ; 4424c (11:424c) +PokedexRatingText_4424c: TX_FAR _OaksLabText_4424c db "@" diff --git a/engine/predefs.asm b/engine/predefs.asm index 16533751..fd11475b 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -49,7 +49,7 @@ GetPredefPointer: ret -PredefPointers:: ; 4fe79 (13:7e79) +PredefPointers:: ; these are pointers to ASM routines. ; they appear to be used in overworld map scripts. add_predef DrawPlayerHUDAndHPBar diff --git a/engine/predefs12.asm b/engine/predefs12.asm index 269a681e..dc79d6f3 100755 --- a/engine/predefs12.asm +++ b/engine/predefs12.asm @@ -1,5 +1,5 @@ ; b = new colour for BG colour 0 (usually white) for 4 frames -ChangeBGPalColor0_4Frames: ; 480eb (12:40eb) +ChangeBGPalColor0_4Frames: call GetPredefRegisters ld a, [rBGP] or b @@ -11,7 +11,7 @@ ChangeBGPalColor0_4Frames: ; 480eb (12:40eb) ld [rBGP], a ret -PredefShakeScreenVertically: ; 480ff (12:40ff) +PredefShakeScreenVertically: ; Moves the window down and then back in a sequence of progressively smaller ; numbers of pixels, starting at b. call GetPredefRegisters @@ -37,7 +37,7 @@ PredefShakeScreenVertically: ; 480ff (12:40ff) ld c, 3 jp DelayFrames -PredefShakeScreenHorizontally: ; 48125 (12:4125) +PredefShakeScreenHorizontally: ; Moves the window right and then back in a sequence of progressively smaller ; numbers of pixels, starting at b. call GetPredefRegisters diff --git a/engine/predefs17.asm b/engine/predefs17.asm index a674b45a..21289c6a 100755 --- a/engine/predefs17.asm +++ b/engine/predefs17.asm @@ -1,6 +1,6 @@ ; this function temporarily makes the starters (and Ivysaur) seen ; so that the full Pokedex information gets displayed in Oak's lab -StarterDex: ; 5c0dc (17:40dc) +StarterDex: ld a, %01001011 ; set starter flags ld [wPokedexOwned], a predef ShowPokedexData diff --git a/engine/predefs17_2.asm b/engine/predefs17_2.asm index c0df7d0a..e9235f13 100755 --- a/engine/predefs17_2.asm +++ b/engine/predefs17_2.asm @@ -1,5 +1,5 @@ ; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in wd11e -SetPartyMonTypes: ; 5db5e (17:5b5e) +SetPartyMonTypes: call GetPredefRegisters ld bc, wPartyMon1Type - wPartyMon1 ; $5 add hl, bc diff --git a/engine/predefs7.asm b/engine/predefs7.asm index c336eaa9..752bdd1a 100755 --- a/engine/predefs7.asm +++ b/engine/predefs7.asm @@ -1,4 +1,4 @@ -DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6) +DisplayElevatorFloorMenu: ld hl, WhichFloorText call PrintText ld hl, wItemList @@ -43,6 +43,6 @@ DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6) ld [hli], a ; destination map ID ret -WhichFloorText: ; 1ca14 (7:4a14) +WhichFloorText: TX_FAR _WhichFloorText db "@" diff --git a/engine/save.asm b/engine/save.asm index e47be58a..4a2ac196 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -1,4 +1,4 @@ -LoadSAV: ; 735e8 (1c:75e8) +LoadSAV: ;(if carry -> write ;"the file data is destroyed") call ClearScreen @@ -27,11 +27,11 @@ LoadSAV: ; 735e8 (1c:75e8) ld [wSaveFileStatus], a ret -FileDataDestroyedText: ; 7361e (1c:761e) +FileDataDestroyedText: TX_FAR _FileDataDestroyedText db "@" -LoadSAV0: ; 73623 (1c:7623) +LoadSAV0: ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -78,7 +78,7 @@ LoadSAV0: ; 73623 (1c:7623) and a jp SAVGoodChecksum -LoadSAV1: ; 73690 (1c:7690) +LoadSAV1: ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -98,7 +98,7 @@ LoadSAV1: ; 73690 (1c:7690) and a jp SAVGoodChecksum -LoadSAV2: ; 736bd (1c:76bd) +LoadSAV2: ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -122,22 +122,22 @@ LoadSAV2: ; 736bd (1c:76bd) and a jp SAVGoodChecksum -SAVBadCheckSum: ; 736f7 (1c:76f7) +SAVBadCheckSum: scf -SAVGoodChecksum: ; 736f8 (1c:76f8) +SAVGoodChecksum: ld a, $0 ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a ret -LoadSAVIgnoreBadCheckSum: ; 73701 (1c:7701) +LoadSAVIgnoreBadCheckSum: ; unused function that loads save data and ignores bad checksums call LoadSAV0 call LoadSAV1 jp LoadSAV2 -SaveSAV: ; 7370a (1c:770a) +SaveSAV: callba PrintSaveScreenText ld hl,WouldYouLikeToSaveText call SaveSAVConfirm @@ -173,7 +173,7 @@ SaveSAV: ; 7370a (1c:770a) NowSavingString: db "Now saving...@" -SaveSAVConfirm: ; 73768 (1c:7768) +SaveSAVConfirm: call PrintText coord hl, 0, 7 lb bc, 8, 1 @@ -187,15 +187,15 @@ WouldYouLikeToSaveText: ; 0x7377d TX_FAR _WouldYouLikeToSaveText db "@" -GameSavedText: ; 73782 (1c:7782) +GameSavedText: TX_FAR _GameSavedText db "@" -OlderFileWillBeErasedText: ; 73787 (1c:7787) +OlderFileWillBeErasedText: TX_FAR _OlderFileWillBeErasedText db "@" -SaveSAVtoSRAM0: ; 7378c (1c:778c) +SaveSAVtoSRAM0: ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -228,7 +228,7 @@ SaveSAVtoSRAM0: ; 7378c (1c:778c) ld [MBC1SRamEnable], a ret -SaveSAVtoSRAM1: ; 737e2 (1c:77e2) +SaveSAVtoSRAM1: ; stored pokémon ld a, SRAM_ENABLE ld [MBC1SRamEnable], a @@ -248,7 +248,7 @@ SaveSAVtoSRAM1: ; 737e2 (1c:77e2) ld [MBC1SRamEnable], a ret -SaveSAVtoSRAM2: ; 7380f (1c:780f) +SaveSAVtoSRAM2: ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -271,14 +271,14 @@ SaveSAVtoSRAM2: ; 7380f (1c:780f) ld [MBC1SRamEnable], a ret -SaveSAVtoSRAM: ; 73848 (1c:7848) +SaveSAVtoSRAM: ld a, $2 ld [wSaveFileStatus], a call SaveSAVtoSRAM0 call SaveSAVtoSRAM1 jp SaveSAVtoSRAM2 -SAVCheckSum: ; 73856 (1c:7856) +SAVCheckSum: ;Check Sum (result[1 byte] is complemented) ld d, 0 .loop @@ -293,7 +293,7 @@ SAVCheckSum: ; 73856 (1c:7856) cpl ret -CalcIndividualBoxCheckSums: ; 73863 (1c:7863) +CalcIndividualBoxCheckSums: ld hl, sBox1 ; sBox7 ld de, sBank2IndividualBoxChecksums ; sBank3IndividualBoxChecksums ld b, NUM_BOXES / 2 @@ -310,7 +310,7 @@ CalcIndividualBoxCheckSums: ; 73863 (1c:7863) jr nz, .loop ret -GetBoxSRAMLocation: ; 7387b (1c:787b) +GetBoxSRAMLocation: ; in: a = box num ; out: b = box SRAM bank, hl = pointer to start of box ld hl, BoxSRAMPointerTable @@ -331,7 +331,7 @@ GetBoxSRAMLocation: ; 7387b (1c:787b) ld l, a ret -BoxSRAMPointerTable: ; 73895 (1c:7895) +BoxSRAMPointerTable: dw sBox1 ; sBox7 dw sBox2 ; sBox8 dw sBox3 ; sBox9 @@ -339,7 +339,7 @@ BoxSRAMPointerTable: ; 73895 (1c:7895) dw sBox5 ; sBox11 dw sBox6 ; sBox12 -ChangeBox:: ; 738a1 (1c:78a1) +ChangeBox:: ld hl, WhenYouChangeBoxText call PrintText call YesNoChoice @@ -385,11 +385,11 @@ ChangeBox:: ; 738a1 (1c:78a1) call WaitForSoundToFinish ret -WhenYouChangeBoxText: ; 73909 (1c:7909) +WhenYouChangeBoxText: TX_FAR _WhenYouChangeBoxText db "@" -CopyBoxToOrFromSRAM: ; 7390e (1c:790e) +CopyBoxToOrFromSRAM: ; copy an entire box from hl to de with b as the SRAM bank push hl ld a, SRAM_ENABLE @@ -418,7 +418,7 @@ CopyBoxToOrFromSRAM: ; 7390e (1c:790e) ld [MBC1SRamEnable], a ret -DisplayChangeBoxMenu: ; 7393f (1c:793f) +DisplayChangeBoxMenu: xor a ld [H_AUTOBGTRANSFERENABLED], a ld a, A_BUTTON | B_BUTTON @@ -489,11 +489,11 @@ DisplayChangeBoxMenu: ; 7393f (1c:793f) ld [H_AUTOBGTRANSFERENABLED], a ret -ChooseABoxText: ; 739d4 (1c:79d4) +ChooseABoxText: TX_FAR _ChooseABoxText db "@" -BoxNames: ; 739d9 (1c:79d9) +BoxNames: db "BOX 1" next "BOX 2" next "BOX 3" @@ -507,10 +507,10 @@ BoxNames: ; 739d9 (1c:79d9) next "BOX11" next "BOX12@" -BoxNoText: ; 73a21 (1c:7a21) +BoxNoText: db "BOX No.@" -EmptyAllSRAMBoxes: ; 73a29 (1c:7a29) +EmptyAllSRAMBoxes: ; marks all boxes in SRAM as empty (initialisation for the first time the ; player changes the box) ld a, SRAM_ENABLE @@ -528,7 +528,7 @@ EmptyAllSRAMBoxes: ; 73a29 (1c:7a29) ld [MBC1SRamEnable], a ret -EmptySRAMBoxesInBank: ; 73a4b (1c:7a4b) +EmptySRAMBoxesInBank: ; marks every box in the current SRAM bank as empty ld hl, sBox1 ; sBox7 call EmptySRAMBox @@ -549,14 +549,14 @@ EmptySRAMBoxesInBank: ; 73a4b (1c:7a4b) call CalcIndividualBoxCheckSums ret -EmptySRAMBox: ; 73a7f (1c:7a7f) +EmptySRAMBox: xor a ld [hli], a dec a ld [hl], a ret -GetMonCountsForAllBoxes: ; 73a84 (1c:7a84) +GetMonCountsForAllBoxes: ld hl, wBoxMonCounts push hl ld a, SRAM_ENABLE @@ -585,7 +585,7 @@ GetMonCountsForAllBoxes: ; 73a84 (1c:7a84) ret -GetMonCountsForBoxesInBank: ; 73ab8 (1c:7ab8) +GetMonCountsForBoxesInBank: ld a, [sBox1] ; sBox7 ld [hli], a ld a, [sBox2] ; sBox8 @@ -600,7 +600,7 @@ GetMonCountsForBoxesInBank: ; 73ab8 (1c:7ab8) ld [hli], a ret -SAVCheckRandomID: ; 73ad1 (1c:7ad1) +SAVCheckRandomID: ;checks if Sav file is the same by checking player's name 1st letter ($a598) ; and the two random numbers generated at game beginning ;(which are stored at wPlayerID)s @@ -634,7 +634,7 @@ SAVCheckRandomID: ; 73ad1 (1c:7ad1) ld [MBC1SRamEnable],a ret -SaveHallOfFameTeams: ; 73b0d (1c:7b0d) +SaveHallOfFameTeams: ld a, [wNumHoFTeams] dec a cp HOF_TEAM_CAPACITY @@ -658,7 +658,7 @@ SaveHallOfFameTeams: ; 73b0d (1c:7b0d) ld bc, HOF_TEAM jr HallOfFame_Copy -LoadHallOfFameTeams: ; 73b3f (1c:7b3f) +LoadHallOfFameTeams: ld hl, sHallOfFame ld bc, HOF_TEAM ld a, [wHoFTeamIndex] @@ -667,7 +667,7 @@ LoadHallOfFameTeams: ; 73b3f (1c:7b3f) ld bc, HOF_TEAM ; fallthrough -HallOfFame_Copy: ; 73b51 (1c:7b51) +HallOfFame_Copy: ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -680,7 +680,7 @@ HallOfFame_Copy: ; 73b51 (1c:7b51) ld [MBC1SRamEnable], a ret -ClearSAV: ; 73b6a (1c:7b6a) +ClearSAV: ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -698,7 +698,7 @@ ClearSAV: ; 73b6a (1c:7b6a) ld [MBC1SRamEnable], a ret -PadSRAM_FF: ; 73b8f (1c:7b8f) +PadSRAM_FF: ld [MBC1SRamBank], a ld hl, $a000 ld bc, $2000 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index eb1cf3c3..733cc29c 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -1,4 +1,4 @@ -PromptUserToPlaySlots: ; 3730e (d:730e) +PromptUserToPlaySlots: call SaveScreenTilesToBuffer2 ld a, BANK(DisplayTextIDInit) ld [wAutoTextBoxDrawingControl], a @@ -52,11 +52,11 @@ PromptUserToPlaySlots: ; 3730e (d:730e) push af jp CloseTextDisplay -PlaySlotMachineText: ; 37390 (d:7390) +PlaySlotMachineText: TX_FAR _PlaySlotMachineText db "@" -MainSlotMachineLoop: ; 37395 (d:7395) +MainSlotMachineLoop: call SlotMachine_PrintCreditCoins xor a ld hl, wPayoutCoins @@ -146,32 +146,32 @@ MainSlotMachineLoop: ; 37395 (d:7395) call SlotMachine_PutOutLitBalls jp MainSlotMachineLoop -CoinMultiplierSlotMachineText: ; 3745e (d:745e) +CoinMultiplierSlotMachineText: db "×3" next "×2" next "×1@" -OutOfCoinsSlotMachineText: ; 37467 (d:7467) +OutOfCoinsSlotMachineText: TX_FAR _OutOfCoinsSlotMachineText db "@" -BetHowManySlotMachineText: ; 3746c (d:746c) +BetHowManySlotMachineText: TX_FAR _BetHowManySlotMachineText db "@" -StartSlotMachineText: ; 37471 (d:7471) +StartSlotMachineText: TX_FAR _StartSlotMachineText db "@" -NotEnoughCoinsSlotMachineText: ; 37476 (d:7476) +NotEnoughCoinsSlotMachineText: TX_FAR _NotEnoughCoinsSlotMachineText db "@" -OneMoreGoSlotMachineText: ; 3747b (d:747b) +OneMoreGoSlotMachineText: TX_FAR _OneMoreGoSlotMachineText db "@" -SlotMachine_SetFlags: ; 37480 (d:7480) +SlotMachine_SetFlags: ld hl, wSlotMachineFlags bit 7, [hl] ret nz @@ -201,7 +201,7 @@ SlotMachine_SetFlags: ; 37480 (d:7480) set 7, [hl] ret -SlotMachine_SpinWheels: ; 374ad (d:74ad) +SlotMachine_SpinWheels: ld c, 20 .loop1 push bc @@ -233,7 +233,7 @@ SlotMachine_SpinWheels: ; 374ad (d:74ad) ; visible. The 3 functions below ensure this by checking if the wheel offset ; is even before stopping the wheel. -SlotMachine_StopOrAnimWheel1: ; 374df (d:74df) +SlotMachine_StopOrAnimWheel1: ld a, [wStoppingWhichSlotMachineWheel] cp 1 jr c, .animWheel @@ -251,7 +251,7 @@ SlotMachine_StopOrAnimWheel1: ; 374df (d:74df) .animWheel jp SlotMachine_AnimWheel1 -SlotMachine_StopOrAnimWheel2: ; 374fb (d:74fb) +SlotMachine_StopOrAnimWheel2: ld a, [wStoppingWhichSlotMachineWheel] cp 2 jr c, .animWheel @@ -269,7 +269,7 @@ SlotMachine_StopOrAnimWheel2: ; 374fb (d:74fb) .animWheel jp SlotMachine_AnimWheel2 -SlotMachine_StopOrAnimWheel3: ; 37517 (d:7517) +SlotMachine_StopOrAnimWheel3: ld a, [wStoppingWhichSlotMachineWheel] cp 3 jr c, .animWheel @@ -285,7 +285,7 @@ SlotMachine_StopOrAnimWheel3: ; 37517 (d:7517) and a ret -SlotMachine_StopWheel1Early: ; 3752c (d:752c) +SlotMachine_StopWheel1Early: call SlotMachine_GetWheel1Tiles ld hl, wSlotMachineWheel1BottomTile ld a, [wSlotMachineFlags] @@ -314,7 +314,7 @@ SlotMachine_StopWheel1Early: ; 3752c (d:752c) ld [hl], 0 ret -SlotMachine_StopWheel2Early: ; 37552 (d:7552) +SlotMachine_StopWheel2Early: call SlotMachine_GetWheel2Tiles ld a, [wSlotMachineFlags] and $80 @@ -337,7 +337,7 @@ SlotMachine_StopWheel2Early: ; 37552 (d:7552) ld [wSlotMachineWheel2SlipCounter], a ret -SlotMachine_FindWheel1Wheel2Matches: ; 3756e (d:756e) +SlotMachine_FindWheel1Wheel2Matches: ; return whether wheel 1 and wheel 2's current positions allow a match (given ; that wheel 3 stops in a good position) in Z ld hl, wSlotMachineWheel1BottomTile @@ -363,7 +363,7 @@ SlotMachine_FindWheel1Wheel2Matches: ; 3756e (d:756e) dec de ret -SlotMachine_CheckForMatches: ; 37588 (d:7588) +SlotMachine_CheckForMatches: call SlotMachine_GetWheel3Tiles ld a, [wSlotMachineBet] cp 2 @@ -475,7 +475,7 @@ SlotMachine_CheckForMatches: ; 37588 (d:7588) ld [rOBP0], a jp .done -SymbolLinedUpSlotMachineText: ; 37665 (d:7665) +SymbolLinedUpSlotMachineText: TX_ASM push bc call SlotMachine_PrintWinningSymbol @@ -487,11 +487,11 @@ SymbolLinedUpSlotMachineText: ; 37665 (d:7665) inc bc ret -LinedUpText: ; 37673 (d:7673) +LinedUpText: TX_FAR _LinedUpText db "@" -SlotRewardPointers: ; 37678 (d:7678) +SlotRewardPointers: dw SlotReward300Func dw SlotReward300Text dw SlotReward100Func @@ -505,24 +505,24 @@ SlotRewardPointers: ; 37678 (d:7678) dw SlotReward15Func dw SlotReward15Text -SlotReward300Text: ; 37690 (d:7690) +SlotReward300Text: db "300@" -SlotReward100Text: ; 37694 (d:7694) +SlotReward100Text: db "100@" -SlotReward8Text: ; 37698 (d:7698) +SlotReward8Text: db "8@" -SlotReward15Text: ; 3769a (d:769a) +SlotReward15Text: db "15@" -NotThisTimeText: ; 3769d (d:769d) +NotThisTimeText: TX_FAR _NotThisTimeText db "@" ; compares the slot machine tiles at bc, de, and hl -SlotMachine_CheckForMatch: ; 376a2 (d:76a2) +SlotMachine_CheckForMatch: ld a, [de] cp [hl] ret nz @@ -530,24 +530,24 @@ SlotMachine_CheckForMatch: ; 376a2 (d:76a2) cp [hl] ret -SlotMachine_GetWheel3Tiles: ; 376a8 (d:76a8) +SlotMachine_GetWheel3Tiles: ld de, wSlotMachineWheel3BottomTile ld hl, SlotMachineWheel3 ld a, [wSlotMachineWheel3Offset] call SlotMachine_GetWheelTiles -SlotMachine_GetWheel2Tiles: ; 376b4 (d:76b4) +SlotMachine_GetWheel2Tiles: ld de, wSlotMachineWheel2BottomTile ld hl, SlotMachineWheel2 ld a, [wSlotMachineWheel2Offset] call SlotMachine_GetWheelTiles -SlotMachine_GetWheel1Tiles: ; 376c0 (d:76c0) +SlotMachine_GetWheel1Tiles: ld de, wSlotMachineWheel1BottomTile ld hl, SlotMachineWheel1 ld a, [wSlotMachineWheel1Offset] -SlotMachine_GetWheelTiles: ; 376c9 (d:76c9) +SlotMachine_GetWheelTiles: ld c, a ld b, 0 add hl, bc @@ -561,7 +561,7 @@ SlotMachine_GetWheelTiles: ; 376c9 (d:76c9) jr nz, .loop ret -SlotReward8Func: ; 376d7 (d:76d7) +SlotReward8Func: ld hl, wSlotMachineAllowMatchesCounter ld a, [hl] and a @@ -572,7 +572,7 @@ SlotReward8Func: ; 376d7 (d:76d7) ld de, 8 ret -SlotReward15Func: ; 376e5 (d:76e5) +SlotReward15Func: ld hl, wSlotMachineAllowMatchesCounter ld a, [hl] and a @@ -583,7 +583,7 @@ SlotReward15Func: ; 376e5 (d:76e5) ld de, 15 ret -SlotReward100Func: ; 376f3 (d:76f3) +SlotReward100Func: ld a, SFX_GET_KEY_ITEM call PlaySound xor a @@ -592,7 +592,7 @@ SlotReward100Func: ; 376f3 (d:76f3) ld de, 100 ret -SlotReward300Func: ; 37702 (d:7702) +SlotReward300Func: ld hl, YeahText call PrintText ld a, SFX_GET_ITEM_2 @@ -608,11 +608,11 @@ SlotReward300Func: ; 37702 (d:7702) ld de, 300 ret -YeahText: ; 37722 (d:7722) +YeahText: TX_FAR _YeahText db $0a, "@" -SlotMachine_PrintWinningSymbol: ; 37728 (d:7728) +SlotMachine_PrintWinningSymbol: ; prints winning symbol and down arrow in text box coord hl, 2, 14 ld a, [wSlotMachineWinningSymbol] @@ -630,7 +630,7 @@ SlotMachine_PrintWinningSymbol: ; 37728 (d:7728) ld [hl], $ee ; down arrow ret -SlotMachine_SubtractBetFromPlayerCoins: ; 37741 (d:7741) +SlotMachine_SubtractBetFromPlayerCoins: ld hl, wTempCoins2 + 1 ld a, [wSlotMachineBet] ld [hld], a @@ -640,19 +640,19 @@ SlotMachine_SubtractBetFromPlayerCoins: ; 37741 (d:7741) ld c, $2 predef SubBCDPredef -SlotMachine_PrintCreditCoins: ; 37754 (d:7754) +SlotMachine_PrintCreditCoins: coord hl, 5, 1 ld de, wPlayerCoins ld c, $2 jp PrintBCDNumber -SlotMachine_PrintPayoutCoins: ; 3775f (d:775f) +SlotMachine_PrintPayoutCoins: coord hl, 11, 1 ld de, wPayoutCoins lb bc, LEADING_ZEROES | 2, 4 ; 2 bytes, 4 digits jp PrintNumber -SlotMachine_PayCoinsToPlayer: ; 3776b (d:776b) +SlotMachine_PayCoinsToPlayer: ld a, $1 ld [wMuteAudioAndPauseMusic], a call WaitForSoundToFinish @@ -709,12 +709,12 @@ SlotMachine_PayCoinsToPlayer: ; 3776b (d:776b) call DelayFrames jr .loop -SlotMachine_PutOutLitBalls: ; 377ce (d:77ce) +SlotMachine_PutOutLitBalls: ld a, $23 ld [wNewSlotMachineBallTile], a jr SlotMachine_UpdateThreeCoinBallTiles -SlotMachine_LightBalls: ; 377d5 (d:77d5) +SlotMachine_LightBalls: ld a, $14 ld [wNewSlotMachineBallTile], a ld a, [wSlotMachineBet] @@ -723,22 +723,22 @@ SlotMachine_LightBalls: ; 377d5 (d:77d5) dec a jr z, SlotMachine_UpdateTwoCoinBallTiles -SlotMachine_UpdateThreeCoinBallTiles: ; 377e3 (d:77e3) +SlotMachine_UpdateThreeCoinBallTiles: coord hl, 3, 2 call SlotMachine_UpdateBallTiles coord hl, 3, 10 call SlotMachine_UpdateBallTiles -SlotMachine_UpdateTwoCoinBallTiles: ; 377ef (d:77ef) +SlotMachine_UpdateTwoCoinBallTiles: coord hl, 3, 4 call SlotMachine_UpdateBallTiles coord hl, 3, 8 call SlotMachine_UpdateBallTiles -SlotMachine_UpdateOneCoinBallTiles: ; 377fb (d:77fb) +SlotMachine_UpdateOneCoinBallTiles: coord hl, 3, 6 -SlotMachine_UpdateBallTiles: ; 377fe (d:77fe) +SlotMachine_UpdateBallTiles: ld a, [wNewSlotMachineBallTile] ld [hl], a ld bc, 13 @@ -753,7 +753,7 @@ SlotMachine_UpdateBallTiles: ; 377fe (d:77fe) ld [hl], a ret -SlotMachine_AnimWheel1: ; 37813 (d:7813) +SlotMachine_AnimWheel1: ld bc, SlotMachineWheel1 ld de, wSlotMachineWheel1Offset ld hl, wOAMBuffer @@ -761,7 +761,7 @@ SlotMachine_AnimWheel1: ; 37813 (d:7813) ld [wBaseCoordX], a jr SlotMachine_AnimWheel -SlotMachine_AnimWheel2: ; 37823 (d:7823) +SlotMachine_AnimWheel2: ld bc, SlotMachineWheel2 ld de, wSlotMachineWheel2Offset ld hl, wOAMBuffer + $30 @@ -769,14 +769,14 @@ SlotMachine_AnimWheel2: ; 37823 (d:7823) ld [wBaseCoordX], a jr SlotMachine_AnimWheel -SlotMachine_AnimWheel3: ; 37833 (d:7833) +SlotMachine_AnimWheel3: ld bc, SlotMachineWheel3 ld de, wSlotMachineWheel3Offset ld hl, wOAMBuffer + $60 ld a, $70 ld [wBaseCoordX], a -SlotMachine_AnimWheel: ; 37841 (d:7841) +SlotMachine_AnimWheel: ld a, $58 ld [wBaseCoordY], a push de @@ -821,7 +821,7 @@ SlotMachine_AnimWheel: ; 37841 (d:7841) ld [de], a ret -SlotMachine_HandleInputWhileWheelsSpin: ; 37882 (d:7882) +SlotMachine_HandleInputWhileWheelsSpin: call DelayFrame call JoypadLowSensitivity ld a, [hJoy5] @@ -845,7 +845,7 @@ SlotMachine_HandleInputWhileWheelsSpin: ; 37882 (d:7882) ret nz jr .loop -LoadSlotMachineTiles: ; 378a8 (d:78a8) +LoadSlotMachineTiles: call DisableLCD ld hl, SlotMachineTiles2 ld de, vChars0 @@ -876,12 +876,12 @@ LoadSlotMachineTiles: ; 378a8 (d:78a8) call SlotMachine_AnimWheel2 jp SlotMachine_AnimWheel3 -SlotMachineMap: ; 378f5 (d:78f5) +SlotMachineMap: INCBIN "gfx/tilemaps/slotmachine.map" INCLUDE "data/slot_machine_wheels.asm" -SlotMachineTiles1: ; 37a51 (d:7a51) +SlotMachineTiles1: IF DEF(_RED) INCBIN "gfx/red/slotmachine1.2bpp" ENDC diff --git a/engine/status_ailments.asm b/engine/status_ailments.asm index 9bcfe9f0..787533c4 100755 --- a/engine/status_ailments.asm +++ b/engine/status_ailments.asm @@ -1,4 +1,4 @@ -PrintStatusAilment: ; 747de (1d:47de) +PrintStatusAilment: ld a, [de] bit PSN, a jr nz, .psn diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index cbe19d6d..fb51d884 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -1,9 +1,9 @@ ; copy text of fixed length NAME_LENGTH (like player name, rival name, mon names, ...) -CopyFixedLengthText: ; 42b1 (1:42b1) +CopyFixedLengthText: ld bc, NAME_LENGTH jp CopyData -SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) +SetDefaultNamesBeforeTitlescreen: ld hl, NintenText ld de, wPlayerName call CopyFixedLengthText @@ -21,7 +21,7 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a -DisplayTitleScreen: ; 42dd (1:42dd) +DisplayTitleScreen: call GBPalWhiteOut ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -158,7 +158,7 @@ ENDC call .ScrollTitleScreenPokemonLogo jr .bouncePokemonLogoLoop -.TitleScreenPokemonLogoYScrolls: ; 43db (1:43db) +.TitleScreenPokemonLogoYScrolls: ; Controls the bouncing effect of the Pokemon logo on the title screen db -4,16 ; y scroll amount, number of times to scroll db 3,4 @@ -257,7 +257,7 @@ ENDC .doClearSaveDialogue jpba DoClearSaveDialogue -TitleScreenPickNewMon: ; 4496 (1:4496) +TitleScreenPickNewMon: ld a, vBGMap0 / $100 call TitleScreenCopyTileMapToVRAM @@ -285,14 +285,14 @@ TitleScreenPickNewMon: ; 4496 (1:4496) callba TitleScroll ret -TitleScreenScrollInMon: ; 44c1 (1:44c1) +TitleScreenScrollInMon: ld d, 0 ; scroll in callba TitleScroll xor a ld [hWY], a ret -ScrollTitleScreenGameVersion: ; 44cf (1:44cf) +ScrollTitleScreenGameVersion: .wait ld a, [rLY] cp l @@ -307,7 +307,7 @@ ScrollTitleScreenGameVersion: ; 44cf (1:44cf) jr z, .wait2 ret -DrawPlayerCharacter: ; 44dd (1:44dd) +DrawPlayerCharacter: ld hl, PlayerCharacterTitleGraphics ld de, vSprites ld bc, PlayerCharacterTitleGraphicsEnd - PlayerCharacterTitleGraphics @@ -344,30 +344,30 @@ DrawPlayerCharacter: ; 44dd (1:44dd) jr nz, .loop ret -ClearBothBGMaps: ; 4519 (1:4519) +ClearBothBGMaps: ld hl, vBGMap0 ld bc, $400 * 2 ld a, " " jp FillMemory -LoadTitleMonSprite: ; 4524 (1:4524) +LoadTitleMonSprite: ld [wcf91], a ld [wd0b5], a coord hl, 5, 10 call GetMonHeader jp LoadFrontSpriteByMonIndex -TitleScreenCopyTileMapToVRAM: ; 4533 (1:4533) +TitleScreenCopyTileMapToVRAM: ld [H_AUTOBGTRANSFERDEST + 1], a jp Delay3 -LoadCopyrightAndTextBoxTiles: ; 4538 (1:4538) +LoadCopyrightAndTextBoxTiles: xor a ld [hWY], a call ClearScreen call LoadTextBoxTilePatterns -LoadCopyrightTiles: ; 4541 (1:4541) +LoadCopyrightTiles: ld de, NintendoCopyrightLogoGraphics ld hl, vChars2 + $600 lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $10 @@ -376,7 +376,7 @@ LoadCopyrightTiles: ; 4541 (1:4541) ld de, CopyrightTextString jp PlaceString -CopyrightTextString: ; 4556 (1:4556) +CopyrightTextString: db $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A ; ©'95.'96.'98 Nintendo next $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72 ; ©'95.'96.'98 Creatures inc. next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc. @@ -385,13 +385,13 @@ CopyrightTextString: ; 4556 (1:4556) INCLUDE "data/title_mons.asm" ; prints version text (red, blue) -PrintGameVersionOnTitleScreen: ; 4598 (1:4598) +PrintGameVersionOnTitleScreen: coord hl, 7, 8 ld de, VersionOnTitleScreenText jp PlaceString ; these point to special tiles specifically loaded for that purpose and are not usual text -VersionOnTitleScreenText: ; 45a1 (1:45a1) +VersionOnTitleScreenText: IF DEF(_RED) db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version" ENDC diff --git a/engine/titlescreen2.asm b/engine/titlescreen2.asm index c0853a0d..2ed77dec 100755 --- a/engine/titlescreen2.asm +++ b/engine/titlescreen2.asm @@ -1,22 +1,22 @@ -TitleScroll_WaitBall: ; 37244 (d:7244) +TitleScroll_WaitBall: ; Wait around for the TitleBall animation to play out. ; hi: speed ; lo: duration db $05, $05, 0 -TitleScroll_In: ; 37247 (d:7247) +TitleScroll_In: ; Scroll a TitleMon in from the right. ; hi: speed ; lo: duration db $a2, $94, $84, $63, $52, $31, $11, 0 -TitleScroll_Out: ; 3724f (d:724f) +TitleScroll_Out: ; Scroll a TitleMon out to the left. ; hi: speed ; lo: duration db $12, $22, $32, $42, $52, $62, $83, $93, 0 -TitleScroll: ; 37258 (d:7258) +TitleScroll: ld a, d ld bc, TitleScroll_In @@ -31,7 +31,7 @@ TitleScroll: ; 37258 (d:7258) ld e, 0 ; don't animate titleball .ok -_TitleScroll: ; 3726a (d:726a) +_TitleScroll: ld a, [bc] and a ret z @@ -82,12 +82,12 @@ _TitleScroll: ; 3726a (d:726a) jr z, .wait2 ret -TitleBallYTable: ; 372a0 (d:72a0) +TitleBallYTable: ; OBJ y-positions for the Poke Ball held by Red in the title screen. ; This is really two 0-terminated lists. Initiated with an index of 1. db 0, $71, $6f, $6e, $6d, $6c, $6d, $6e, $6f, $71, $74, 0 -TitleScreenAnimateBallIfStarterOut: ; 372ac (d:72ac) +TitleScreenAnimateBallIfStarterOut: ; Animate the TitleBall if a starter just got scrolled out. ld a, [wTitleMonSpecies] cp STARTER1 @@ -102,7 +102,7 @@ TitleScreenAnimateBallIfStarterOut: ; 372ac (d:72ac) ld d, 0 jp _TitleScroll -GetTitleBallY: ; 372c4 (d:72c4) +GetTitleBallY: ; Get position e from TitleBallYTable push de push hl diff --git a/engine/town_map.asm b/engine/town_map.asm index 727197de..b2f1e656 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -1,4 +1,4 @@ -DisplayTownMap: ; 70e3e (1c:4e3e) +DisplayTownMap: call LoadTownMap ld hl, wUpdateSpritesEnabled ld a, [hl] @@ -105,11 +105,11 @@ DisplayTownMap: ; 70e3e (1c:4e3e) INCLUDE "data/town_map_order.asm" -TownMapCursor: ; 70f40 (1c:4f40) +TownMapCursor: INCBIN "gfx/town_map_cursor.1bpp" TownMapCursorEnd: -LoadTownMap_Nest: ; 70f60 (1c:4f60) +LoadTownMap_Nest: call LoadTownMap ld hl, wUpdateSpritesEnabled ld a, [hl] @@ -131,10 +131,10 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60) ld [hl], a ret -MonsNestText: ; 70f89 (1c:4f89) +MonsNestText: db "'s NEST@" -LoadTownMap_Fly: ; 70f90 (1c:4f90) +LoadTownMap_Fly: call ClearSprites call LoadTownMap call LoadPlayerSpriteGraphics @@ -243,10 +243,10 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) ld hl, wFlyLocationsList + 11 jr .pressedDown -ToText: ; 7106d (1c:506d) +ToText: db "To@" -BuildFlyLocationsList: ; 71070 (1c:5070) +BuildFlyLocationsList: ld hl, wFlyLocationsList - 1 ld [hl], $ff inc hl @@ -270,11 +270,11 @@ BuildFlyLocationsList: ; 71070 (1c:5070) ld [hl], $ff ret -TownMapUpArrow: ; 71093 (1c:5093) +TownMapUpArrow: INCBIN "gfx/up_arrow.1bpp" TownMapUpArrowEnd: -LoadTownMap: ; 7109b (1c:509b) +LoadTownMap: call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites @@ -324,11 +324,11 @@ LoadTownMap: ; 7109b (1c:509b) ld [wTownMapSpriteBlinkingEnabled], a ret -CompressedMap: ; 71100 (1c:5100) +CompressedMap: ; you can decompress this file with the redrle program in the extras/ dir INCBIN "gfx/town_map.rle" -ExitTownMap: ; 711ab (1c:51ab) +ExitTownMap: ; clear town map graphics data and load usual graphics data xor a ld [wTownMapSpriteBlinkingEnabled], a @@ -340,7 +340,7 @@ ExitTownMap: ; 711ab (1c:51ab) call UpdateSprites jp RunDefaultPaletteCommand -DrawPlayerOrBirdSprite: ; 711c4 (1c:51c4) +DrawPlayerOrBirdSprite: ; a = map number ; b = OAM base tile push af @@ -366,7 +366,7 @@ DrawPlayerOrBirdSprite: ; 711c4 (1c:51c4) ld bc, $a0 jp CopyData -DisplayWildLocations: ; 711ef (1c:51ef) +DisplayWildLocations: callba FindWildLocationsOfMon call ZeroOutDuplicatesInList ld hl, wOAMBuffer @@ -414,10 +414,10 @@ DisplayWildLocations: ; 711ef (1c:51ef) ld bc, $a0 jp CopyData -AreaUnknownText: ; 7124a (1c:524a) +AreaUnknownText: db " AREA UNKNOWN@" -TownMapCoordsToOAMCoords: ; 71258 (1c:5258) +TownMapCoordsToOAMCoords: ; in: lower nybble of a = x, upper nybble of a = y ; out: b and [hl] = (y * 8) + 24, c and [hl+1] = (x * 8) + 24 push af @@ -435,14 +435,14 @@ TownMapCoordsToOAMCoords: ; 71258 (1c:5258) ld [hli], a ret -WritePlayerOrBirdSpriteOAM: ; 7126d (1c:526d) +WritePlayerOrBirdSpriteOAM: ld a, [wOAMBaseTile] and a ld hl, wOAMBuffer + $90 ; for player sprite jr z, WriteTownMapSpriteOAM ld hl, wOAMBuffer + $80 ; for bird sprite -WriteTownMapSpriteOAM: ; 71279 (1c:5279) +WriteTownMapSpriteOAM: push hl ; Subtract 4 from c (X coord) and 4 from b (Y coord). However, the carry from c @@ -454,7 +454,7 @@ WriteTownMapSpriteOAM: ; 71279 (1c:5279) ld c, l pop hl -WriteAsymmetricMonPartySpriteOAM: ; 71281 (1c:5281) +WriteAsymmetricMonPartySpriteOAM: ; Writes 4 OAM blocks for a helix mon party sprite, since it does not have ; a vertical line of symmetry. lb de, 2, 2 @@ -487,7 +487,7 @@ WriteAsymmetricMonPartySpriteOAM: ; 71281 (1c:5281) jr nz, .loop ret -WriteSymmetricMonPartySpriteOAM: ; 712a6 (1c:52a6) +WriteSymmetricMonPartySpriteOAM: ; Writes 4 OAM blocks for a mon party sprite other than a helix. All the ; sprites other than the helix one have a vertical line of symmetry which allows ; the X-flip OAM bit to be used so that only 2 rather than 4 tile patterns are @@ -529,7 +529,7 @@ WriteSymmetricMonPartySpriteOAM: ; 712a6 (1c:52a6) jr nz, .loop ret -ZeroOutDuplicatesInList: ; 712d9 (1c:52d9) +ZeroOutDuplicatesInList: ; replace duplicate bytes in the list of wild pokemon locations with 0 ld de, wBuffer .loop @@ -552,7 +552,7 @@ ZeroOutDuplicatesInList: ; 712d9 (1c:52d9) inc hl jr .zeroDuplicatesLoop -LoadTownMapEntry: ; 712f1 (1c:52f1) +LoadTownMapEntry: ; in: a = map number ; out: lower nybble of [de] = x, upper nybble of [de] = y, hl = address of name cp REDS_HOUSE_1F @@ -586,11 +586,11 @@ INCLUDE "data/town_map_entries.asm" INCLUDE "text/map_names.asm" -MonNestIcon: ; 716be (1c:56be) +MonNestIcon: INCBIN "gfx/mon_nest_icon.1bpp" MonNestIconEnd: -TownMapSpriteBlinkingAnimation: ; 716c6 (1c:56c6) +TownMapSpriteBlinkingAnimation: ld a, [wAnimCounter] inc a cp 25 diff --git a/engine/trade.asm b/engine/trade.asm index 1642e729..78444cf6 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -1,4 +1,4 @@ -InternalClockTradeAnim: ; 410e2 (10:50e2) +InternalClockTradeAnim: ; Do the trading animation with the player's gameboy on the left. ; In-game trades and internally clocked link cable trades use this. ld a, [wTradedPlayerMonSpecies] @@ -8,7 +8,7 @@ InternalClockTradeAnim: ; 410e2 (10:50e2) ld de, InternalClockTradeFuncSequence jr TradeAnimCommon -ExternalClockTradeAnim: ; 410f3 (10:50f3) +ExternalClockTradeAnim: ; Do the trading animation with the player's gameboy on the right. ; Externally clocked link cable trades use this. ld a, [wTradedEnemyMonSpecies] @@ -17,7 +17,7 @@ ExternalClockTradeAnim: ; 410f3 (10:50f3) ld [wRightGBMonSpecies], a ld de, ExternalClockTradeFuncSequence -TradeAnimCommon: ; 41102 (10:5102) +TradeAnimCommon: ld a, [wOptions] push af ld a, [hSCY] @@ -69,7 +69,7 @@ tradefunc: MACRO ; They are from opposite perspectives. The external clock one makes use of ; Trade_SwapNames to swap the player and enemy names for some functions. -InternalClockTradeFuncSequence: ; 41138 (10:5138) +InternalClockTradeFuncSequence: tradefunc LoadTradingGFXAndMonNames tradefunc Trade_ShowPlayerMon tradefunc Trade_DrawOpenEndOfLinkCable @@ -88,7 +88,7 @@ InternalClockTradeFuncSequence: ; 41138 (10:5138) tradefunc Trade_Cleanup db $FF -ExternalClockTradeFuncSequence: ; 41149 (10:5149) +ExternalClockTradeFuncSequence: tradefunc LoadTradingGFXAndMonNames tradefunc Trade_ShowClearedWindow tradefunc PrintTradeWillTradeText @@ -112,7 +112,7 @@ ExternalClockTradeFuncSequence: ; 41149 (10:5149) tradefunc Trade_Cleanup db $FF -TradeFuncPointerTable: ; 4115f (10:515f) +TradeFuncPointerTable: addtradefunc LoadTradingGFXAndMonNames addtradefunc Trade_ShowPlayerMon addtradefunc Trade_DrawOpenEndOfLinkCable @@ -131,11 +131,11 @@ TradeFuncPointerTable: ; 4115f (10:515f) addtradefunc Trade_SlideTextBoxOffScreen addtradefunc Trade_SwapNames -Trade_Delay100: ; 41181 (10:5181) +Trade_Delay100: ld c, 100 jp DelayFrames -Trade_CopyTileMapToVRAM: ; 41186 (10:5186) +Trade_CopyTileMapToVRAM: ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 @@ -143,17 +143,17 @@ Trade_CopyTileMapToVRAM: ; 41186 (10:5186) ld [H_AUTOBGTRANSFERENABLED], a ret -Trade_Delay80: ; 41191 (10:5191) +Trade_Delay80: ld c, 80 jp DelayFrames -Trade_ClearTileMap: ; 41196 (10:5196) +Trade_ClearTileMap: coord hl, 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " jp FillMemory -LoadTradingGFXAndMonNames: ; 411a1 (10:51a1) +LoadTradingGFXAndMonNames: call Trade_ClearTileMap call DisableLCD ld hl, TradingAnimationGraphics @@ -196,12 +196,12 @@ LoadTradingGFXAndMonNames: ; 411a1 (10:51a1) ld [wd11e], a jp GetMonName -Trade_LoadMonPartySpriteGfx: ; 4120b (10:520b) +Trade_LoadMonPartySpriteGfx: ld a, %11010000 ld [rOBP1], a jpba LoadMonPartySpriteGfx -Trade_SwapNames: ; 41217 (10:5217) +Trade_SwapNames: ld hl, wPlayerName ld de, wBuffer ld bc, NAME_LENGTH @@ -215,14 +215,14 @@ Trade_SwapNames: ; 41217 (10:5217) ld bc, NAME_LENGTH jp CopyData -Trade_Cleanup: ; 4123b (10:523b) +Trade_Cleanup: xor a call LoadGBPal ld hl, wd730 res 6, [hl] ; turn off instant text printing ret -Trade_ShowPlayerMon: ; 41245 (10:5245) +Trade_ShowPlayerMon: ld a, %10101011 ld [rLCDC], a ld a, $50 @@ -264,7 +264,7 @@ Trade_ShowPlayerMon: ; 41245 (10:5245) ld [H_AUTOBGTRANSFERENABLED], a ret -Trade_DrawOpenEndOfLinkCable: ; 41298 (10:5298) +Trade_DrawOpenEndOfLinkCable: call Trade_ClearTileMap ld b, vBGMap0 / $100 call CopyScreenTileBufferToVRAM @@ -296,7 +296,7 @@ Trade_DrawOpenEndOfLinkCable: ; 41298 (10:5298) jr nz, .loop ret -Trade_AnimateBallEnteringLinkCable: ; 412d2 (10:52d2) +Trade_AnimateBallEnteringLinkCable: ld a, TRADE_BALL_SHAKE_ANIM call Trade_ShowAnimation ld c, 10 @@ -345,11 +345,11 @@ Trade_AnimateBallEnteringLinkCable: ; 412d2 (10:52d2) ld [H_AUTOBGTRANSFERENABLED], a ret -Trade_BallInsideLinkCableOAM: ; 4132e (10:532e) +Trade_BallInsideLinkCableOAM: db $7E,$00,$7E,$20 db $7E,$40,$7E,$60 -Trade_ShowEnemyMon: ; 41336 (10:5336) +Trade_ShowEnemyMon: ld a, TRADE_BALL_TILT_ANIM call Trade_ShowAnimation call Trade_ShowClearedWindow @@ -375,7 +375,7 @@ Trade_ShowEnemyMon: ; 41336 (10:5336) call ClearScreenArea jp PrintTradeTakeCareText -Trade_AnimLeftToRight: ; 41376 (10:5376) +Trade_AnimLeftToRight: ; Animates the mon moving from the left GB to the right one. call Trade_InitGameboyTransferGfx ld a, $1 @@ -409,7 +409,7 @@ Trade_AnimLeftToRight: ; 41376 (10:5376) call Trade_AnimMonMoveVertical jp ClearSprites -Trade_AnimRightToLeft: ; 413c6 (10:53c6) +Trade_AnimRightToLeft: ; Animates the mon moving from the right GB to the left one. call Trade_InitGameboyTransferGfx xor a @@ -441,7 +441,7 @@ Trade_AnimRightToLeft: ; 413c6 (10:53c6) ld [H_AUTOBGTRANSFERENABLED], a jp ClearSprites -Trade_InitGameboyTransferGfx: ; 41411 (10:5411) +Trade_InitGameboyTransferGfx: ; Initialises the graphics for showing a mon moving between gameboys. ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -458,7 +458,7 @@ Trade_InitGameboyTransferGfx: ; 41411 (10:5411) ld [hWY], a ret -Trade_DrawLeftGameboy: ; 4142d (10:542d) +Trade_DrawLeftGameboy: call Trade_ClearTileMap ; draw link cable @@ -488,7 +488,7 @@ Trade_DrawLeftGameboy: ; 4142d (10:542d) jp DelayFrame -Trade_DrawRightGameboy: ; 4145c (10:545c) +Trade_DrawRightGameboy: call Trade_ClearTileMap ; draw horizontal segment of link cable @@ -535,7 +535,7 @@ Trade_DrawRightGameboy: ; 4145c (10:545c) jp DelayFrame -Trade_DrawCableAcrossScreen: ; 4149f (10:549f) +Trade_DrawCableAcrossScreen: ; Draws the link cable across the screen. call Trade_ClearTileMap coord hl, 0, 4 @@ -547,7 +547,7 @@ Trade_DrawCableAcrossScreen: ; 4149f (10:549f) jr nz, .loop ret -Trade_CopyCableTilesOffScreen: ; 414ae (10:54ae) +Trade_CopyCableTilesOffScreen: ; This is used to copy the link cable tiles off screen so that the cable ; continues when the screen is scrolled. push hl @@ -563,7 +563,7 @@ Trade_CopyCableTilesOffScreen: ; 414ae (10:54ae) ld c, 10 jp DelayFrames -Trade_AnimMonMoveHorizontal: ; 414c5 (10:54c5) +Trade_AnimMonMoveHorizontal: ; Animates the mon going through the link cable horizontally over a distance of ; b 16-pixel units. ld a, [wTradedMonMovingRight] @@ -590,7 +590,7 @@ Trade_AnimMonMoveHorizontal: ; 414c5 (10:54c5) jr nz, Trade_AnimMonMoveHorizontal ret -Trade_AnimCircledMon: ; 414e8 (10:54e8) +Trade_AnimCircledMon: ; Cycles between the two animation frames of the mon party sprite, cycles ; between a circle and an oval around the mon sprite, and makes the cable flash. push de @@ -614,11 +614,11 @@ Trade_AnimCircledMon: ; 414e8 (10:54e8) pop de ret -Trade_WriteCircledMonOAM: ; 41505 (10:5505) +Trade_WriteCircledMonOAM: callba WriteMonPartySpriteOAMBySpecies call Trade_WriteCircleOAM -Trade_AddOffsetsToOAMCoords: ; 41510 (10:5510) +Trade_AddOffsetsToOAMCoords: ld hl, wOAMBuffer ld c, $14 .loop @@ -634,7 +634,7 @@ Trade_AddOffsetsToOAMCoords: ; 41510 (10:5510) jr nz, .loop ret -Trade_AnimMonMoveVertical: ; 41525 (10:5525) +Trade_AnimMonMoveVertical: ; Animates the mon going through the link cable vertically as well as ; horizontally for a bit. The last bit of horizontal movement (when moving ; right) or the first bit of horizontal movement (when moving left) are done @@ -670,7 +670,7 @@ Trade_AnimMonMoveVertical: ; 41525 (10:5525) jr nz, .loop ret -Trade_WriteCircleOAM: ; 41558 (10:5558) +Trade_WriteCircleOAM: ; Writes the OAM blocks for the circle around the traded mon as it passes ; the link cable. ld hl, Trade_CircleOAMPointers @@ -697,7 +697,7 @@ Trade_WriteCircleOAM: ; 41558 (10:5558) jr nz, .loop ret -Trade_CircleOAMPointers: ; 41574 (10:5574) +Trade_CircleOAMPointers: dw Trade_CircleOAM0 db $08,$08 dw Trade_CircleOAM1 @@ -707,24 +707,24 @@ Trade_CircleOAMPointers: ; 41574 (10:5574) dw Trade_CircleOAM3 db $18,$18 -Trade_CircleOAM0: ; 41584 (10:5584) +Trade_CircleOAM0: db $38,$10,$39,$10 db $3A,$10,$3B,$10 -Trade_CircleOAM1: ; 4158c (10:558c) +Trade_CircleOAM1: db $39,$30,$38,$30 db $3B,$30,$3A,$30 -Trade_CircleOAM2: ; 41594 (10:5594) +Trade_CircleOAM2: db $3A,$50,$3B,$50 db $38,$50,$39,$50 -Trade_CircleOAM3: ; 4159c (10:559c) +Trade_CircleOAM3: db $3B,$70,$3A,$70 db $39,$70,$38,$70 ; a = species -Trade_LoadMonSprite: ; 415a4 (10:55a4) +Trade_LoadMonSprite: ld [wcf91], a ld [wd0b5], a ld [wWholeScreenPaletteMonSpecies], a @@ -740,7 +740,7 @@ Trade_LoadMonSprite: ; 415a4 (10:55a4) ld c, 10 jp DelayFrames -Trade_ShowClearedWindow: ; 415c8 (10:55c8) +Trade_ShowClearedWindow: ; clears the window and covers the BG entirely with the window ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -755,7 +755,7 @@ Trade_ShowClearedWindow: ; 415c8 (10:55c8) ld [hSCX], a ret -Trade_SlideTextBoxOffScreen: ; 415df (10:55df) +Trade_SlideTextBoxOffScreen: ; Slides the window right until it's off screen. The window usually just has ; a text box at the bottom when this is called. However, when this is called ; after Trade_ShowEnemyMon in the external clock sequence, there is a mon pic @@ -777,18 +777,18 @@ Trade_SlideTextBoxOffScreen: ; 415df (10:55df) ld [rWX], a ret -PrintTradeWentToText: ; 415fe (10:55fe) +PrintTradeWentToText: ld hl, TradeWentToText call PrintText ld c, 200 call DelayFrames jp Trade_SlideTextBoxOffScreen -TradeWentToText: ; 4160c (10:560c) +TradeWentToText: TX_FAR _TradeWentToText db "@" -PrintTradeForSendsText: ; 41611 (10:5611) +PrintTradeForSendsText: ld hl, TradeForText call PrintText call Trade_Delay80 @@ -796,15 +796,15 @@ PrintTradeForSendsText: ; 41611 (10:5611) call PrintText jp Trade_Delay80 -TradeForText: ; 41623 (10:5623) +TradeForText: TX_FAR _TradeForText db "@" -TradeSendsText: ; 41628 (10:5628) +TradeSendsText: TX_FAR _TradeSendsText db "@" -PrintTradeFarewellText: ; 4162d (10:562d) +PrintTradeFarewellText: ld hl, TradeWavesFarewellText call PrintText call Trade_Delay80 @@ -813,24 +813,24 @@ PrintTradeFarewellText: ; 4162d (10:562d) call Trade_Delay80 jp Trade_SlideTextBoxOffScreen -TradeWavesFarewellText: ; 41642 (10:5642) +TradeWavesFarewellText: TX_FAR _TradeWavesFarewellText db "@" -TradeTransferredText: ; 41647 (10:5647) +TradeTransferredText: TX_FAR _TradeTransferredText db "@" -PrintTradeTakeCareText: ; 4164c (10:564c) +PrintTradeTakeCareText: ld hl, TradeTakeCareText call PrintText jp Trade_Delay80 -TradeTakeCareText: ; 41655 (10:5655) +TradeTakeCareText: TX_FAR _TradeTakeCareText db "@" -PrintTradeWillTradeText: ; 4165a (10:565a) +PrintTradeWillTradeText: ld hl, TradeWillTradeText call PrintText call Trade_Delay80 @@ -838,15 +838,15 @@ PrintTradeWillTradeText: ; 4165a (10:565a) call PrintText jp Trade_Delay80 -TradeWillTradeText: ; 4166c (10:566c) +TradeWillTradeText: TX_FAR _TradeWillTradeText db "@" -TradeforText: ; 41671 (10:5671) +TradeforText: TX_FAR _TradeforText db "@" -Trade_ShowAnimation: ; 41676 (10:5676) +Trade_ShowAnimation: ld [wAnimationID], a xor a ld [wAnimationType], a diff --git a/engine/trade2.asm b/engine/trade2.asm index 10bef792..16d07b17 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -1,4 +1,4 @@ -Trade_PrintPlayerMonInfoText: ; 42769 (10:6769) +Trade_PrintPlayerMonInfoText: coord hl, 5, 0 ld de,Trade_MonInfoText call PlaceString @@ -20,7 +20,7 @@ Trade_PrintPlayerMonInfoText: ; 42769 (10:6769) lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber -Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7) +Trade_PrintEnemyMonInfoText: coord hl, 5, 10 ld de,Trade_MonInfoText call PlaceString @@ -42,7 +42,7 @@ Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7) lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber -Trade_MonInfoText: ; 427e5 (10:67e5) +Trade_MonInfoText: db "──",$74,$F2,$4E db $4E db "OT/",$4E diff --git a/engine/turn_sprite.asm b/engine/turn_sprite.asm index 84037cfe..e8a47a8f 100755 --- a/engine/turn_sprite.asm +++ b/engine/turn_sprite.asm @@ -1,4 +1,4 @@ -UpdateSpriteFacingOffsetAndDelayMovement: ; 13074 (4:7074) +UpdateSpriteFacingOffsetAndDelayMovement: ld h, $c2 ld a, [H_CURRENTSPRITEOFFSET] add $8 diff --git a/home.asm b/home.asm index 2090e599..0db583a6 100644 --- a/home.asm +++ b/home.asm @@ -118,7 +118,7 @@ INCLUDE "data/map_header_pointers.asm" INCLUDE "home/overworld.asm" -CheckForUserInterruption:: ; 12f8 (0:12f8) +CheckForUserInterruption:: ; Return carry if Up+Select+B, Start or A are pressed in c frames. ; Used only in the intro and title screen. call DelayFrame @@ -148,7 +148,7 @@ CheckForUserInterruption:: ; 12f8 (0:12f8) ; function to load position data for destination warp when switching maps ; INPUT: ; a = ID of destination warp within destination map -LoadDestinationWarpPosition:: ; 1313 (0:1313) +LoadDestinationWarpPosition:: ld b,a ld a,[H_LOADEDROMBANK] push af @@ -170,7 +170,7 @@ LoadDestinationWarpPosition:: ; 1313 (0:1313) ret -DrawHPBar:: ; 1336 (0:1336) +DrawHPBar:: ; Draw an HP bar d tiles long, and fill it to e pixels. ; If c is nonzero, show at least a sliver regardless. ; The right end of the bar changes with [wHPBarType]. @@ -252,11 +252,11 @@ DrawHPBar:: ; 1336 (0:1336) ; [wcf91] = pokemon ID ; wLoadedMon = base address of pokemon data ; wMonHeader = base address of base stats -LoadMonData:: ; 1372 (0:1372) +LoadMonData:: jpab LoadMonData_ -OverwritewMoves:: ; 137a (0:137a) +OverwritewMoves:: ; Write c to [wMoves + b]. Unused. ld hl, wMoves ld e, b @@ -266,11 +266,11 @@ OverwritewMoves:: ; 137a (0:137a) ld [hl], a ret -LoadFlippedFrontSpriteByMonIndex:: ; 1384 (0:1384) +LoadFlippedFrontSpriteByMonIndex:: ld a, 1 ld [wSpriteFlipped], a -LoadFrontSpriteByMonIndex:: ; 1389 (0:1389) +LoadFrontSpriteByMonIndex:: push hl ld a, [wd11e] push af @@ -311,13 +311,13 @@ LoadFrontSpriteByMonIndex:: ; 1389 (0:1389) ret -PlayCry:: ; 13d0 (0:13d0) +PlayCry:: ; Play monster a's cry. call GetCryData call PlaySound jp WaitForSoundToFinish -GetCryData:: ; 13d9 (0:13d9) +GetCryData:: ; Load cry data for monster a. dec a ld c, a @@ -348,7 +348,7 @@ GetCryData:: ; 13d9 (0:13d9) ret -DisplayPartyMenu:: ; 13fc (0:13fc) +DisplayPartyMenu:: ld a,[hTilesetType] push af xor a @@ -359,7 +359,7 @@ DisplayPartyMenu:: ; 13fc (0:13fc) call DrawPartyMenu jp HandlePartyMenuInput -GoBackToPartyMenu:: ; 1411 (0:1411) +GoBackToPartyMenu:: ld a,[hTilesetType] push af xor a @@ -368,7 +368,7 @@ GoBackToPartyMenu:: ; 1411 (0:1411) call RedrawPartyMenu jp HandlePartyMenuInput -PartyMenuInit:: ; 1420 (0:1420) +PartyMenuInit:: ld a, 1 ; hardcoded bank call BankswitchHome call LoadHpBarAndStatusTilePatterns @@ -407,7 +407,7 @@ PartyMenuInit:: ; 1420 (0:1420) ld [hl], a ; old menu item ID ret -HandlePartyMenuInput:: ; 145a (0:145a) +HandlePartyMenuInput:: ld a,1 ld [wMenuWrappingEnabled],a ld a,$40 @@ -463,14 +463,14 @@ HandlePartyMenuInput:: ; 145a (0:145a) callba SwitchPartyMon jr HandlePartyMenuInput -DrawPartyMenu:: ; 14d4 (0:14d4) +DrawPartyMenu:: ld hl, DrawPartyMenu_ jr DrawPartyMenuCommon -RedrawPartyMenu:: ; 14d9 (0:14d9) +RedrawPartyMenu:: ld hl, RedrawPartyMenu_ -DrawPartyMenuCommon:: ; 14dc (0:14dc) +DrawPartyMenuCommon:: ld b, BANK(RedrawPartyMenu_) jp Bankswitch @@ -478,7 +478,7 @@ DrawPartyMenuCommon:: ; 14dc (0:14dc) ; INPUT: ; de = address of status condition ; hl = destination address -PrintStatusCondition:: ; 14e1 (0:14e1) +PrintStatusCondition:: push de dec de dec de ; de = address of current HP @@ -514,7 +514,7 @@ PrintStatusConditionNotFainted: ; 14f6 ; INPUT: ; hl = destination address ; [wLoadedMonLevel] = level -PrintLevel:: ; 150b (0:150b) +PrintLevel:: ld a,$6e ; ":L" tile ID ld [hli],a ld c,2 ; number of digits @@ -530,19 +530,19 @@ PrintLevel:: ; 150b (0:150b) ; INPUT: ; hl = destination address ; [wLoadedMonLevel] = level -PrintLevelFull:: ; 151b (0:151b) +PrintLevelFull:: ld a,$6e ; ":L" tile ID ld [hli],a ld c,3 ; number of digits ld a,[wLoadedMonLevel] ; level -PrintLevelCommon:: ; 1523 (0:1523) +PrintLevelCommon:: ld [wd11e],a ld de,wd11e ld b,LEFT_ALIGN | 1 ; 1 byte jp PrintNumber -GetwMoves:: ; 152e (0:152e) +GetwMoves:: ; Unused. Returns the move at index a from wMoves in a ld hl,wMoves ld c,a @@ -554,7 +554,7 @@ GetwMoves:: ; 152e (0:152e) ; copies the base stat data of a pokemon to wMonHeader ; INPUT: ; [wd0b5] = pokemon ID -GetMonHeader:: ; 1537 (0:1537) +GetMonHeader:: ld a,[H_LOADEDROMBANK] push af ld a,BANK(BaseStats) @@ -618,12 +618,12 @@ GetMonHeader:: ; 1537 (0:1537) ret ; copy party pokemon's name to wcd6d -GetPartyMonName2:: ; 15b4 (0:15b4) +GetPartyMonName2:: ld a,[wWhichPokemon] ; index within party ld hl,wPartyMonNicks ; this is called more often -GetPartyMonName:: ; 15ba (0:15ba) +GetPartyMonName:: push hl push bc call SkipFixedLengthTextEntries ; add NAME_LENGTH to hl, a times @@ -649,7 +649,7 @@ GetPartyMonName:: ; 15ba (0:15ba) ; bits 0-4: length of BCD number in bytes ; Note that bits 5 and 7 are modified during execution. The above reflects ; their meaning at the beginning of the functions's execution. -PrintBCDNumber:: ; 15cd (0:15cd) +PrintBCDNumber:: ld b,c ; save flags in b res 7,c res 6,c @@ -687,7 +687,7 @@ PrintBCDNumber:: ; 15cd (0:15cd) .done ret -PrintBCDDigit:: ; 1604 (0:1604) +PrintBCDDigit:: and $f and a jr z,.zeroDigit @@ -717,7 +717,7 @@ PrintBCDDigit:: ; 1604 (0:1604) ; uncompresses the front or back sprite of the specified mon ; assumes the corresponding mon header is already loaded ; hl contains offset to sprite pointer ($b for front or $d for back) -UncompressMonSprite:: ; 1627 (0:1627) +UncompressMonSprite:: ld bc,wMonHeader add hl,bc ld a,[hli] @@ -762,7 +762,7 @@ UncompressMonSprite:: ; 1627 (0:1627) jp UncompressSpriteData ; de: destination location -LoadMonFrontSprite:: ; 1665 (0:1665) +LoadMonFrontSprite:: push de ld hl, wMonHFrontSprite - wMonHeader call UncompressMonSprite @@ -776,7 +776,7 @@ LoadMonFrontSprite:: ; 1665 (0:1665) ; calculates alignment parameters to place both sprite chunks in the center of the 7*7 tile sprite buffers ; de: destination location ; a,c: sprite dimensions (in tiles of 8x8 each) -LoadUncompressedSpriteData:: ; 1672 (0:1672) +LoadUncompressedSpriteData:: push de and $f ld [H_SPRITEWIDTH], a ; each byte contains 8 pixels (in 1bpp), so tiles=bytes for width @@ -825,7 +825,7 @@ LoadUncompressedSpriteData:: ; 1672 (0:1672) ; copies and aligns the sprite data properly inside the sprite buffer ; sprite buffers are 7*7 tiles in size, the loaded sprite is centered within this area -AlignSpriteDataCentered:: ; 16c2 (0:16c2) +AlignSpriteDataCentered:: ld a, [H_SPRITEOFFSET] ld b, $0 ld c, a @@ -851,7 +851,7 @@ AlignSpriteDataCentered:: ; 16c2 (0:16c2) ret ; fills the sprite buffer (pointed to in hl) with zeros -ZeroSpriteBuffer:: ; 16df (0:16df) +ZeroSpriteBuffer:: ld bc, SPRITEBUFFERSIZE .nextByteLoop xor a @@ -865,7 +865,7 @@ ZeroSpriteBuffer:: ; 16df (0:16df) ; combines the (7*7 tiles, 1bpp) sprite chunks in buffer 0 and 1 into a 2bpp sprite located in buffer 1 through 2 ; in the resulting sprite, the rows of the two source sprites are interlaced ; de: output address -InterlaceMergeSpriteBuffers:: ; 16ea (0:16ea) +InterlaceMergeSpriteBuffers:: xor a ld [$4000], a push de @@ -924,7 +924,7 @@ INCLUDE "home/timer.asm" INCLUDE "home/audio.asm" -UpdateSprites:: ; 2429 (0:2429) +UpdateSprites:: ld a, [wUpdateSpritesEnabled] dec a ret nz @@ -941,33 +941,33 @@ UpdateSprites:: ; 2429 (0:2429) INCLUDE "data/mart_inventories.asm" -TextScriptEndingChar:: ; 24d6 (0:24d6) +TextScriptEndingChar:: db "@" -TextScriptEnd:: ; 24d7 (0:24d7) +TextScriptEnd:: ld hl,TextScriptEndingChar ret -ExclamationText:: ; 24db (0:24db) +ExclamationText:: TX_FAR _ExclamationText db "@" -GroundRoseText:: ; 24e0 (0:24e0) +GroundRoseText:: TX_FAR _GroundRoseText db "@" -BoulderText:: ; 24e5 (0:24e5) +BoulderText:: TX_FAR _BoulderText db "@" -MartSignText:: ; 24ea (0:24ea) +MartSignText:: TX_FAR _MartSignText db "@" -PokeCenterSignText:: ; 24ef (0:24ef) +PokeCenterSignText:: TX_FAR _PokeCenterSignText db "@" -PickUpItemText:: ; 24f4 (0:24f4) +PickUpItemText:: ; XXX better label (what does predef $5C do?) TX_ASM predef PickUpItem @@ -977,7 +977,7 @@ PickUpItemText:: ; 24f4 (0:24f4) INCLUDE "home/pic.asm" -ResetPlayerSpriteData:: ; 28a6 (0:28a6) +ResetPlayerSpriteData:: ld hl, wSpriteStateData1 call ResetPlayerSpriteData_ClearSpriteData ld hl, wSpriteStateData2 @@ -993,12 +993,12 @@ ResetPlayerSpriteData:: ; 28a6 (0:28a6) ret ; overwrites sprite data with zeroes -ResetPlayerSpriteData_ClearSpriteData:: ; 28c4 (0:28c4) +ResetPlayerSpriteData_ClearSpriteData:: ld bc, $10 xor a jp FillMemory -FadeOutAudio:: ; 28cb (0:28cb) +FadeOutAudio:: ld a, [wAudioFadeOutControl] and a jr nz, .asm_28dc @@ -1049,7 +1049,7 @@ FadeOutAudio:: ; 28cb (0:28cb) ; this function is used to display sign messages, sprite dialog, etc. ; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID -DisplayTextID:: ; 2920 (0:2920) +DisplayTextID:: ld a,[H_LOADEDROMBANK] push af callba DisplayTextIDInit ; initialization @@ -1143,20 +1143,20 @@ DisplayTextID:: ; 2920 (0:2920) and a jr nz,HoldTextDisplayOpen -AfterDisplayingTextID:: ; 29d6 (0:29d6) +AfterDisplayingTextID:: ld a,[wEnteringCableClub] and a jr nz,HoldTextDisplayOpen call WaitForTextScrollButtonPress ; wait for a button press after displaying all the text ; loop to hold the dialogue box open as long as the player keeps holding down the A button -HoldTextDisplayOpen:: ; 29df (0:29df) +HoldTextDisplayOpen:: call Joypad ld a,[hJoyHeld] bit 0,a ; is the A button being pressed? jr nz,HoldTextDisplayOpen -CloseTextDisplay:: ; 29e8 (0:29e8) +CloseTextDisplay:: ld a,[wCurMap] call SwitchToMapRomBank ld a,$90 @@ -1192,7 +1192,7 @@ CloseTextDisplay:: ; 29e8 (0:29e8) ld [MBC1RomBank],a jp UpdateSprites -DisplayPokemartDialogue:: ; 2a2e (0:2a2e) +DisplayPokemartDialogue:: push hl ld hl,PokemartGreetingText call PrintText @@ -1212,11 +1212,11 @@ DisplayPokemartDialogue:: ; 2a2e (0:2a2e) ld [MBC1RomBank],a jp AfterDisplayingTextID -PokemartGreetingText:: ; 2a55 (0:2a55) +PokemartGreetingText:: TX_FAR _PokemartGreetingText db "@" -LoadItemList:: ; 2a5a (0:2a5a) +LoadItemList:: ld a,1 ld [wUpdateSpritesEnabled],a ld a,h @@ -1232,7 +1232,7 @@ LoadItemList:: ; 2a5a (0:2a5a) jr nz,.loop ret -DisplayPokemonCenterDialogue:: ; 2a72 (0:2a72) +DisplayPokemonCenterDialogue:: ; zeroing these doesn't appear to serve any purpose xor a ld [$ff8b],a @@ -1251,20 +1251,20 @@ DisplayPokemonCenterDialogue:: ; 2a72 (0:2a72) ld [MBC1RomBank],a jp AfterDisplayingTextID -DisplaySafariGameOverText:: ; 2a90 (0:2a90) +DisplaySafariGameOverText:: callab PrintSafariGameOverText jp AfterDisplayingTextID -DisplayPokemonFaintedText:: ; 2a9b (0:2a9b) +DisplayPokemonFaintedText:: ld hl,PokemonFaintedText call PrintText jp AfterDisplayingTextID -PokemonFaintedText:: ; 2aa4 (0:2aa4) +PokemonFaintedText:: TX_FAR _PokemonFaintedText db "@" -DisplayPlayerBlackedOutText:: ; 2aa9 (0:2aa9) +DisplayPlayerBlackedOutText:: ld hl,PlayerBlackedOutText call PrintText ld a,[wd732] @@ -1272,16 +1272,16 @@ DisplayPlayerBlackedOutText:: ; 2aa9 (0:2aa9) ld [wd732],a jp HoldTextDisplayOpen -PlayerBlackedOutText:: ; 2aba (0:2aba) +PlayerBlackedOutText:: TX_FAR _PlayerBlackedOutText db "@" -DisplayRepelWoreOffText:: ; 2abf (0:2abf) +DisplayRepelWoreOffText:: ld hl,RepelWoreOffText call PrintText jp AfterDisplayingTextID -RepelWoreOffText:: ; 2ac8 (0:2ac8) +RepelWoreOffText:: TX_FAR _RepelWoreOffText db "@" @@ -1293,7 +1293,7 @@ INCLUDE "engine/menu/start_menu.asm" ; b = length of string of bytes ; OUTPUT: ; [wNumSetBits] = number of set bits -CountSetBits:: ; 2b7f (0:2b7f) +CountSetBits:: ld c,0 .loop ld a,[hli] @@ -1314,11 +1314,11 @@ CountSetBits:: ; 2b7f (0:2b7f) ; subtracts the amount the player paid from their money ; sets carry flag if there is enough money and unsets carry flag if not -SubtractAmountPaidFromMoney:: ; 2b96 (0:2b96) +SubtractAmountPaidFromMoney:: jpba SubtractAmountPaidFromMoney_ ; adds the amount the player sold to their money -AddAmountSoldToMoney:: ; 2b9e (0:2b9e) +AddAmountSoldToMoney:: ld de,wPlayerMoney + 2 ld hl,$ffa1 ; total price of items ld c,3 ; length of money in bytes @@ -1335,7 +1335,7 @@ AddAmountSoldToMoney:: ; 2b9e (0:2b9e) ; HL = address of inventory (either wNumBagItems or wNumBoxItems) ; [wWhichPokemon] = index (within the inventory) of the item to remove ; [wItemQuantity] = quantity to remove -RemoveItemFromInventory:: ; 2bbb (0:2bbb) +RemoveItemFromInventory:: ld a,[H_LOADEDROMBANK] push af ld a,BANK(RemoveItemFromInventory_) @@ -1353,7 +1353,7 @@ RemoveItemFromInventory:: ; 2bbb (0:2bbb) ; [wcf91] = item ID ; [wItemQuantity] = item quantity ; sets carry flag if successful, unsets carry flag if unsuccessful -AddItemToInventory:: ; 2bcf (0:2bcf) +AddItemToInventory:: push bc ld a,[H_LOADEDROMBANK] push af @@ -1371,7 +1371,7 @@ AddItemToInventory:: ; 2bcf (0:2bcf) ; INPUT: ; [wListMenuID] = list menu ID ; [wListPointer] = address of the list (2 bytes) -DisplayListMenuID:: ; 2be6 (0:2be6) +DisplayListMenuID:: xor a ld [H_AUTOBGTRANSFERENABLED],a ; disable auto-transfer ld a,1 @@ -1425,7 +1425,7 @@ DisplayListMenuID:: ; 2be6 (0:2be6) ld c,10 call DelayFrames -DisplayListMenuIDLoop:: ; 2c53 (0:2c53) +DisplayListMenuIDLoop:: xor a ld [H_AUTOBGTRANSFERENABLED],a ; disable transfer call PrintListMenuEntries @@ -1562,7 +1562,7 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) dec [hl] jp DisplayListMenuIDLoop -DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) +DisplayChooseQuantityMenu:: ; text box dimensions/coordinates for just quantity coord hl, 15, 9 ld b,1 ; height @@ -1681,13 +1681,13 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ld a,$ff ret -InitialQuantityText:: ; 2e30 (0:2e30) +InitialQuantityText:: db "×01@" -SpacesBetweenQuantityAndPriceText:: ; 2e34 (0:2e34) +SpacesBetweenQuantityAndPriceText:: db " @" -ExitListMenu:: ; 2e3b (0:2e3b) +ExitListMenu:: ld a,[wCurrentMenuItem] ld [wChosenMenuItem],a ld a,CANCELLED_MENU @@ -1703,7 +1703,7 @@ ExitListMenu:: ; 2e3b (0:2e3b) scf ret -PrintListMenuEntries:: ; 2e5a (0:2e5a) +PrintListMenuEntries:: coord hl, 5, 3 ld b,9 ld c,14 @@ -1892,10 +1892,10 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) ld de,ListMenuCancelText jp PlaceString -ListMenuCancelText:: ; 2f97 (0:2f97) +ListMenuCancelText:: db "CANCEL@" -GetMonName:: ; 2f9e (0:2f9e) +GetMonName:: push hl ld a,[H_LOADEDROMBANK] push af @@ -1921,7 +1921,7 @@ GetMonName:: ; 2f9e (0:2f9e) pop hl ret -GetItemName:: ; 2fcf (0:2fcf) +GetItemName:: ; given an item ID at [wd11e], store the name of the item into a string ; starting at wcd6d push hl @@ -1946,7 +1946,7 @@ GetItemName:: ; 2fcf (0:2fcf) pop hl ret -GetMachineName:: ; 2ff3 (0:2ff3) +GetMachineName:: ; copies the name of the TM/HM in [wd11e] to wcd6d push hl push de @@ -1999,14 +1999,14 @@ GetMachineName:: ; 2ff3 (0:2ff3) pop hl ret -TechnicalPrefix:: ; 303c (0:303c) +TechnicalPrefix:: db "TM" -HiddenPrefix:: ; 303e (0:303e) +HiddenPrefix:: db "HM" ; sets carry if item is HM, clears carry if item is not HM ; Input: a = item ID -IsItemHM:: ; 3040 (0:3040) +IsItemHM:: cp a,HM_01 jr c,.notHM cp a,TM_01 @@ -2017,16 +2017,16 @@ IsItemHM:: ; 3040 (0:3040) ; sets carry if move is an HM, clears carry if move is not an HM ; Input: a = move ID -IsMoveHM:: ; 3049 (0:3049) +IsMoveHM:: ld hl,HMMoves ld de,1 jp IsInArray -HMMoves:: ; 3052 (0:3052) +HMMoves:: db CUT,FLY,SURF,STRENGTH,FLASH db $ff ; terminator -GetMoveName:: ; 3058 (0:3058) +GetMoveName:: push hl ld a,MOVE_NAME ld [wNameListType],a @@ -2040,7 +2040,7 @@ GetMoveName:: ; 3058 (0:3058) ret ; reloads text box tile patterns, current map view, and tileset tile patterns -ReloadMapData:: ; 3071 (0:3071) +ReloadMapData:: ld a,[H_LOADEDROMBANK] push af ld a,[wCurMap] @@ -2056,7 +2056,7 @@ ReloadMapData:: ; 3071 (0:3071) ret ; reloads tileset tile patterns -ReloadTilesetTilePatterns:: ; 3090 (0:3090) +ReloadTilesetTilePatterns:: ld a,[H_LOADEDROMBANK] push af ld a,[wCurMap] @@ -2070,13 +2070,13 @@ ReloadTilesetTilePatterns:: ; 3090 (0:3090) ret ; shows the town map and lets the player choose a destination to fly to -ChooseFlyDestination:: ; 30a9 (0:30a9) +ChooseFlyDestination:: ld hl,wd72e res 4,[hl] jpba LoadTownMap_Fly ; causes the text box to close without waiting for a button press after displaying text -DisableWaitingAfterTextDisplay:: ; 30b6 (0:30b6) +DisableWaitingAfterTextDisplay:: ld a,$01 ld [wDoNotWaitForButtonPressAfterDisplayingText],a ret @@ -2090,7 +2090,7 @@ DisableWaitingAfterTextDisplay:: ; 30b6 (0:30b6) ; 00: unsucessful ; 01: successful ; 02: not able to be used right now, no extra menu displayed (only certain items use this) -UseItem:: ; 30bc (0:30bc) +UseItem:: jpba UseItem_ ; confirms the item toss and then tosses the item @@ -2101,7 +2101,7 @@ UseItem:: ; 30bc (0:30bc) ; [wItemQuantity] = quantity to toss ; OUTPUT: ; clears carry flag if the item is tossed, sets carry flag if not -TossItem:: ; 30c4 (0:30c4) +TossItem:: ld a,[H_LOADEDROMBANK] push af ld a,BANK(TossItem_) @@ -2121,7 +2121,7 @@ TossItem:: ; 30c4 (0:30c4) ; [wIsKeyItem] = result ; 00: item is not key item ; 01: item is key item -IsKeyItem:: ; 30d9 (0:30d9) +IsKeyItem:: push hl push de push bc @@ -2135,7 +2135,7 @@ IsKeyItem:: ; 30d9 (0:30d9) ; INPUT: ; [wTextBoxID] = text box ID ; b, c = y, x cursor position (TWO_OPTION_MENU only) -DisplayTextBoxID:: ; 30e8 (0:30e8) +DisplayTextBoxID:: ld a,[H_LOADEDROMBANK] push af ld a,BANK(DisplayTextBoxID_) @@ -2150,7 +2150,7 @@ DisplayTextBoxID:: ; 30e8 (0:30e8) ; not zero if an NPC movement script is running, the player character is ; automatically stepping down from a door, or joypad states are being simulated -IsPlayerCharacterBeingControlledByGame:: ; 30fd (0:30fd) +IsPlayerCharacterBeingControlledByGame:: ld a, [wNPCMovementScriptPointerTableNum] and a ret nz @@ -2161,7 +2161,7 @@ IsPlayerCharacterBeingControlledByGame:: ; 30fd (0:30fd) and $80 ret -RunNPCMovementScript:: ; 310e (0:310e) +RunNPCMovementScript:: ld hl, wd736 bit 0, [hl] res 0, [hl] @@ -2196,14 +2196,14 @@ RunNPCMovementScript:: ; 310e (0:310e) .playerStepOutFromDoor jpba PlayerStepOutFromDoor -EndNPCMovementScript:: ; 314e (0:314e) +EndNPCMovementScript:: jpba _EndNPCMovementScript -EmptyFunc2:: ; 3156 (0:3156) +EmptyFunc2:: ret ; stores hl in [wTrainerHeaderPtr] -StoreTrainerHeaderPointer:: ; 3157 (0:3157) +StoreTrainerHeaderPointer:: ld a, h ld [wTrainerHeaderPtr], a ld a, l @@ -2212,7 +2212,7 @@ StoreTrainerHeaderPointer:: ; 3157 (0:3157) ; executes the current map script from the function pointer array provided in hl. ; a: map script index to execute (unless overridden by [wd733] bit 4) -ExecuteCurMapScriptInTable:: ; 3160 (0:3160) +ExecuteCurMapScriptInTable:: push af push de call StoreTrainerHeaderPointer @@ -2231,7 +2231,7 @@ ExecuteCurMapScriptInTable:: ; 3160 (0:3160) ld a, [wCurMapScript] ret -LoadGymLeaderAndCityName:: ; 317f (0:317f) +LoadGymLeaderAndCityName:: push de ld de, wGymCityName ld bc, $11 @@ -2248,7 +2248,7 @@ LoadGymLeaderAndCityName:: ; 317f (0:317f) ; 4 -> before battle text (into hl) ; 6 -> after battle text (into hl) ; 8 -> end battle text (into hl) -ReadTrainerHeaderInfo:: ; 3193 (0:3193) +ReadTrainerHeaderInfo:: push de push af ld d, $0 @@ -2290,7 +2290,7 @@ ReadTrainerHeaderInfo:: ; 3193 (0:3193) TrainerFlagAction:: predef_jump FlagActionPredef -TalkToTrainer:: ; 31cc (0:31cc) +TalkToTrainer:: call StoreTrainerHeaderPointer xor a call ReadTrainerHeaderInfo ; read flag's bit @@ -2329,7 +2329,7 @@ TalkToTrainer:: ; 31cc (0:31cc) jp StartTrainerBattle ; checks if any trainers are seeing the player and wanting to fight -CheckFightingMapTrainers:: ; 3219 (0:3219) +CheckFightingMapTrainers:: call CheckForEngagingTrainers ld a, [wSpriteIndex] cp $ff @@ -2355,7 +2355,7 @@ CheckFightingMapTrainers:: ; 3219 (0:3219) ret ; display the before battle text after the enemy trainer has walked up to the player's sprite -DisplayEnemyTrainerTextAndStartBattle:: ; 324c (0:324c) +DisplayEnemyTrainerTextAndStartBattle:: ld a, [wd730] and $1 ret nz ; return if the enemy trainer hasn't finished walking to the player's sprite @@ -2365,7 +2365,7 @@ DisplayEnemyTrainerTextAndStartBattle:: ; 324c (0:324c) call DisplayTextID ; fall through -StartTrainerBattle:: ; 325d (0:325d) +StartTrainerBattle:: xor a ld [wJoyIgnore], a call InitBattleEnemyParameters @@ -2378,7 +2378,7 @@ StartTrainerBattle:: ; 325d (0:325d) inc [hl] ; increment map script index (next script function is usually EndTrainerBattle) ret -EndTrainerBattle:: ; 3275 (0:3275) +EndTrainerBattle:: ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] @@ -2412,7 +2412,7 @@ EndTrainerBattle:: ; 3275 (0:3275) res 4, [hl] ret nz -ResetButtonPressedAndMapScript:: ; 32c1 (0:32c1) +ResetButtonPressedAndMapScript:: xor a ld [wJoyIgnore], a ld [hJoyHeld], a @@ -2422,11 +2422,11 @@ ResetButtonPressedAndMapScript:: ; 32c1 (0:32c1) ret ; calls TrainerWalkUpToPlayer -TrainerWalkUpToPlayer_Bank0:: ; 32cf (0:32cf) +TrainerWalkUpToPlayer_Bank0:: jpba TrainerWalkUpToPlayer ; sets opponent type and mon set/lvl based on the engaging trainer data -InitBattleEnemyParameters:: ; 32d7 (0:32d7) +InitBattleEnemyParameters:: ld a, [wEngagedTrainerClass] ld [wCurOpponent], a ld [wEnemyMonOrTrainerClass], a @@ -2439,25 +2439,25 @@ InitBattleEnemyParameters:: ; 32d7 (0:32d7) ld [wCurEnemyLVL], a ret -GetSpritePosition1:: ; 32ef (0:32ef) +GetSpritePosition1:: ld hl, _GetSpritePosition1 jr SpritePositionBankswitch -GetSpritePosition2:: ; 32f4 (0:32f4) +GetSpritePosition2:: ld hl, _GetSpritePosition2 jr SpritePositionBankswitch -SetSpritePosition1:: ; 32f9 (0:32f9) +SetSpritePosition1:: ld hl, _SetSpritePosition1 jr SpritePositionBankswitch -SetSpritePosition2:: ; 32fe (0:32fe) +SetSpritePosition2:: ld hl, _SetSpritePosition2 -SpritePositionBankswitch:: ; 3301 (0:3301) +SpritePositionBankswitch:: ld b, BANK(_GetSpritePosition1) ; BANK(_GetSpritePosition2), BANK(_SetSpritePosition1), BANK(_SetSpritePosition2) jp Bankswitch ; indirect jump to one of the four functions -CheckForEngagingTrainers:: ; 3306 (0:3306) +CheckForEngagingTrainers:: xor a call ReadTrainerHeaderInfo ; read trainer flag's bit (unused) ld d, h ; store trainer header address in de @@ -2505,7 +2505,7 @@ CheckForEngagingTrainers:: ; 3306 (0:3306) ; hl = text if the player wins ; de = text if the player loses -SaveEndBattleTextPointers:: ; 3354 (0:3354) +SaveEndBattleTextPointers:: ld a, [H_LOADEDROMBANK] ld [wEndBattleTextRomBank], a ld a, h @@ -2520,7 +2520,7 @@ SaveEndBattleTextPointers:: ; 3354 (0:3354) ; loads data of some trainer on the current map and plays pre-battle music ; [wSpriteIndex]: sprite ID of trainer who is engaged -EngageMapTrainer:: ; 336a (0:336a) +EngageMapTrainer:: ld hl, wMapSpriteExtraData ld d, $0 ld a, [wSpriteIndex] @@ -2534,7 +2534,7 @@ EngageMapTrainer:: ; 336a (0:336a) ld [wEnemyMonAttackMod], a jp PlayTrainerMusic -PrintEndBattleText:: ; 3381 (0:3381) +PrintEndBattleText:: push hl ld hl, wd72d bit 7, [hl] @@ -2557,7 +2557,7 @@ PrintEndBattleText:: ; 3381 (0:3381) callba FreezeEnemyTrainerSprite jp WaitForSoundToFinish -GetSavedEndBattleTextPointer:: ; 33b7 (0:33b7) +GetSavedEndBattleTextPointer:: ld a, [wBattleResult] and a ; won battle @@ -2574,7 +2574,7 @@ GetSavedEndBattleTextPointer:: ; 33b7 (0:33b7) ld l, a ret -TrainerEndBattleText:: ; 33cf (0:33cf) +TrainerEndBattleText:: TX_FAR _TrainerNameText TX_ASM call GetSavedEndBattleTextPointer @@ -2584,7 +2584,7 @@ TrainerEndBattleText:: ; 33cf (0:33cf) ; only engage withe trainer if the player is not already ; engaged with another trainer ; XXX unused? -CheckIfAlreadyEngaged:: ; 33dd (0:33dd) +CheckIfAlreadyEngaged:: ld a, [wFlags_0xcd60] bit 0, a ret nz @@ -2592,7 +2592,7 @@ CheckIfAlreadyEngaged:: ; 33dd (0:33dd) xor a ret -PlayTrainerMusic:: ; 33e8 (0:33e8) +PlayTrainerMusic:: ld a, [wEngagedTrainerClass] cp OPP_SONY1 ret z @@ -2643,7 +2643,7 @@ INCLUDE "data/trainer_types.asm" ; and if so, decodes the RLE movement data ; b = player Y ; c = player X -DecodeArrowMovementRLE:: ; 3442 (0:3442) +DecodeArrowMovementRLE:: ld a, [hli] cp $ff ret z ; no match in the list @@ -2667,33 +2667,33 @@ DecodeArrowMovementRLE:: ; 3442 (0:3442) inc hl jr DecodeArrowMovementRLE -FuncTX_ItemStoragePC:: ; 3460 (0:3460) +FuncTX_ItemStoragePC:: call SaveScreenTilesToBuffer2 ld b, BANK(PlayerPC) ld hl, PlayerPC jr bankswitchAndContinue -FuncTX_BillsPC:: ; 346a (0:346a) +FuncTX_BillsPC:: call SaveScreenTilesToBuffer2 ld b, BANK(BillsPC_) ld hl, BillsPC_ jr bankswitchAndContinue -FuncTX_SlotMachine:: ; 3474 (0:3474) +FuncTX_SlotMachine:: ; XXX find a better name for this function ; special_F7 ld b,BANK(CeladonPrizeMenu) ld hl,CeladonPrizeMenu -bankswitchAndContinue:: ; 3479 (0:3479) +bankswitchAndContinue:: call Bankswitch jp HoldTextDisplayOpen ; continue to main text-engine function -FuncTX_PokemonCenterPC:: ; 347f (0:347f) +FuncTX_PokemonCenterPC:: ld b, BANK(ActivatePC) ld hl, ActivatePC jr bankswitchAndContinue -StartSimulatingJoypadStates:: ; 3486 (0:3486) +StartSimulatingJoypadStates:: xor a ld [wOverrideSimulatedJoypadStatesMask], a ld [wSpriteStateData2 + $06], a ; player's sprite movement byte 1 @@ -2701,7 +2701,7 @@ StartSimulatingJoypadStates:: ; 3486 (0:3486) set 7, [hl] ret -IsItemInBag:: ; 3493 (0:3493) +IsItemInBag:: ; given an item_id in b ; set zero flag if item isn't in player's bag ; else reset zero flag @@ -2711,16 +2711,16 @@ IsItemInBag:: ; 3493 (0:3493) and a ret -DisplayPokedex:: ; 349b (0:349b) +DisplayPokedex:: ld [wd11e], a jpba _DisplayPokedex -SetSpriteFacingDirectionAndDelay:: ; 34a6 (0:34a6) +SetSpriteFacingDirectionAndDelay:: call SetSpriteFacingDirection ld c, 6 jp DelayFrames -SetSpriteFacingDirection:: ; 34ae (0:34ae) +SetSpriteFacingDirection:: ld a, $9 ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 @@ -2728,7 +2728,7 @@ SetSpriteFacingDirection:: ; 34ae (0:34ae) ld [hl], a ret -SetSpriteImageIndexAfterSettingFacingDirection:: ; 34b9 (0:34b9) +SetSpriteImageIndexAfterSettingFacingDirection:: ld de, -7 add hl, de ld [hl], a @@ -2740,14 +2740,14 @@ SetSpriteImageIndexAfterSettingFacingDirection:: ; 34b9 (0:34b9) ; OUTPUT: ; [wCoordIndex] = if there is match, the matching array index ; sets carry if the coordinates are in the array, clears carry if not -ArePlayerCoordsInArray:: ; 34bf (0:34bf) +ArePlayerCoordsInArray:: ld a,[wYCoord] ld b,a ld a,[wXCoord] ld c,a ; fallthrough -CheckCoords:: ; 34c7 (0:34c7) +CheckCoords:: xor a ld [wCoordIndex],a .loop @@ -2781,7 +2781,7 @@ CheckCoords:: ; 34c7 (0:34c7) ; OUTPUT: ; [wCoordIndex] = if there is match, the matching array index ; sets carry if the coordinates are in the array, clears carry if not -CheckBoulderCoords:: ; 34e4 (0:34e4) +CheckBoulderCoords:: push hl ld hl, wSpriteStateData2 + $04 ld a, [H_SPRITEINDEX] @@ -2798,11 +2798,11 @@ CheckBoulderCoords:: ; 34e4 (0:34e4) pop hl jp CheckCoords -GetPointerWithinSpriteStateData1:: ; 34fc (0:34fc) +GetPointerWithinSpriteStateData1:: ld h, $c1 jr _GetPointerWithinSpriteStateData -GetPointerWithinSpriteStateData2:: ; 3500 (0:3500) +GetPointerWithinSpriteStateData2:: ld h, $c2 _GetPointerWithinSpriteStateData: @@ -2819,7 +2819,7 @@ _GetPointerWithinSpriteStateData: ; the final $ff will be replicated in the output list and a contains the number of bytes written ; de: input list ; hl: output list -DecodeRLEList:: ; 350c (0:350c) +DecodeRLEList:: xor a ld [wRLEByteCount], a ; count written bytes here .listLoop @@ -2846,7 +2846,7 @@ DecodeRLEList:: ; 350c (0:350c) ret ; sets movement byte 1 for sprite [H_SPRITEINDEX] to $FE and byte 2 to [hSpriteMovementByte2] -SetSpriteMovementBytesToFE:: ; 3533 (0:3533) +SetSpriteMovementBytesToFE:: push hl call GetSpriteMovementByte1Pointer ld [hl], $fe @@ -2857,7 +2857,7 @@ SetSpriteMovementBytesToFE:: ; 3533 (0:3533) ret ; sets both movement bytes for sprite [H_SPRITEINDEX] to $FF -SetSpriteMovementBytesToFF:: ; 3541 (0:3541) +SetSpriteMovementBytesToFF:: push hl call GetSpriteMovementByte1Pointer ld [hl],$FF @@ -2867,7 +2867,7 @@ SetSpriteMovementBytesToFF:: ; 3541 (0:3541) ret ; returns the sprite movement byte 1 pointer for sprite [H_SPRITEINDEX] in hl -GetSpriteMovementByte1Pointer:: ; 354e (0:354e) +GetSpriteMovementByte1Pointer:: ld h,$C2 ld a,[H_SPRITEINDEX] swap a @@ -2876,7 +2876,7 @@ GetSpriteMovementByte1Pointer:: ; 354e (0:354e) ret ; returns the sprite movement byte 2 pointer for sprite [H_SPRITEINDEX] in hl -GetSpriteMovementByte2Pointer:: ; 3558 (0:3558) +GetSpriteMovementByte2Pointer:: push de ld hl,wMapSpriteData ld a,[H_SPRITEINDEX] @@ -2888,7 +2888,7 @@ GetSpriteMovementByte2Pointer:: ; 3558 (0:3558) pop de ret -GetTrainerInformation:: ; 3566 (0:3566) +GetTrainerInformation:: call GetTrainerName ld a, [wLinkState] and a @@ -2921,7 +2921,7 @@ GetTrainerInformation:: ; 3566 (0:3566) ld [hl], d ret -GetTrainerName:: ; 359e (0:359e) +GetTrainerName:: jpba GetTrainerName_ @@ -2942,7 +2942,7 @@ HasEnoughCoins:: jp StringCmp -BankswitchHome:: ; 35bc (0:35bc) +BankswitchHome:: ; switches to bank # in a ; Only use this when in the home bank! ld [wBankswitchHomeTemp],a @@ -2953,14 +2953,14 @@ BankswitchHome:: ; 35bc (0:35bc) ld [MBC1RomBank],a ret -BankswitchBack:: ; 35cd (0:35cd) +BankswitchBack:: ; returns from BankswitchHome ld a,[wBankswitchHomeSavedROMBank] ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a ret -Bankswitch:: ; 35d6 (0:35d6) +Bankswitch:: ; self-contained bankswitch, use this when not in the home bank ; switches to the bank in b ld a,[H_LOADEDROMBANK] @@ -2980,25 +2980,25 @@ Bankswitch:: ; 35d6 (0:35d6) ; displays yes/no choice ; yes -> set carry -YesNoChoice:: ; 35ec (0:35ec) +YesNoChoice:: call SaveScreenTilesToBuffer1 call InitYesNoTextBoxParameters jr DisplayYesNoChoice -Func_35f4:: ; 35f4 (0:35f4) +Func_35f4:: ld a, TWO_OPTION_MENU ld [wTextBoxID], a call InitYesNoTextBoxParameters jp DisplayTextBoxID -InitYesNoTextBoxParameters:: ; 35ff (0:35ff) +InitYesNoTextBoxParameters:: xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a coord hl, 14, 7 ld bc, $80f ret -YesNoChoicePokeCenter:: ; 360a (0:360a) +YesNoChoicePokeCenter:: call SaveScreenTilesToBuffer1 ld a, HEAL_CANCEL_MENU ld [wTwoOptionMenuID], a @@ -3006,20 +3006,20 @@ YesNoChoicePokeCenter:: ; 360a (0:360a) lb bc, 8, 12 jr DisplayYesNoChoice -Func_361a:: ; 361a (0:361a) +Func_361a:: call SaveScreenTilesToBuffer1 ld a, WIDE_YES_NO_MENU ld [wTwoOptionMenuID], a coord hl, 12, 7 lb bc, 8, 13 -DisplayYesNoChoice:: ; 3628 (0:3628) +DisplayYesNoChoice:: ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID jp LoadScreenTilesFromBuffer1 ; calculates the difference |a-b|, setting carry flag if a