diff options
| author | iimarckus <iimarckus@gmail.com> | 2013-12-09 21:23:19 -0800 |
|---|---|---|
| committer | iimarckus <iimarckus@gmail.com> | 2013-12-09 21:23:19 -0800 |
| commit | f17320d7a835709da4c991e0e67300d001ffc53c (patch) | |
| tree | 9dc5044efa04fd16baf25c0ca0c43a68409dee61 /main.asm | |
| parent | 2ed422c6960cf0ec57c3a336b092c2af06bbc1e8 (diff) | |
| parent | 1953e89b86572fec2e0628ddee029833c253eca9 (diff) | |
Merge pull request #19 from yenatch/crystal-makefile
bring pokered into this century
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 3360 |
1 files changed, 1680 insertions, 1680 deletions
@@ -58,7 +58,7 @@ EnableLCD: ; 007b (0:007b) CleanLCD_OAM: ; 0082 (0:0082) xor a - ld hl,W_OAMBUFFER + ld hl,wOAMBuffer ld b,$a0 .loop ld [hli],a @@ -68,7 +68,7 @@ CleanLCD_OAM: ; 0082 (0:0082) ResetLCD_OAM: ; 008d (0:008d) ld a,$a0 - ld hl,W_OAMBUFFER + ld hl,wOAMBuffer ld de,$0004 ld b,$28 .loop @@ -444,7 +444,7 @@ HandleMidJump: ; 039e (0:039e) ; this is jumped to immediately after loading a save / starting a new game / loading a new map EnterMap: ; 03a6 (0:03a6) ld a,$ff - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a call LoadMapData ; load map data ld b,BANK(Func_c335) ld hl,Func_c335 @@ -480,7 +480,7 @@ EnterMap: ; 03a6 (0:03a6) set 5,[hl] set 6,[hl] xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a OverworldLoop: ; 03ff (0:03ff) call DelayFrame @@ -490,7 +490,7 @@ OverworldLoopLessDelay: ; 0402 (0:0402) ld a,[$d736] bit 6,a ; jumping down a ledge? call nz, HandleMidJump - ld a,[W_WALKCOUNTER] + ld a,[wWalkCounter] and a jp nz,.moveAhead ; if the player sprite has not yet completed the walking animation call GetJoypadStateOverworld ; get joypad state (which is possibly simulated) @@ -545,7 +545,7 @@ OverworldLoopLessDelay: ; 0402 (0:0402) ld a,$35 call Predef ; check what is in front of the player call UpdateSprites ; move sprites - ld a,[W_FLAGS_CD60] + ld a,[wFlags_0xcd60] bit 2,a jr nz,.checkForOpponent bit 0,a @@ -578,7 +578,7 @@ OverworldLoopLessDelay: ; 0402 (0:0402) jp nz,.newBattle jp OverworldLoop .noDirectionButtonsPressed - ld hl,W_FLAGS_CD60 + ld hl,wFlags_0xcd60 res 2,[hl] call UpdateSprites ; move sprites ld a,$01 @@ -659,7 +659,7 @@ OverworldLoopLessDelay: ; 0402 (0:0402) ld a,$08 ld [$d528],a .oddLoop - ld hl,W_FLAGS_CD60 + ld hl,wFlags_0xcd60 set 2,[hl] ld hl,$cc4b dec [hl] @@ -694,7 +694,7 @@ OverworldLoopLessDelay: ; 0402 (0:0402) jp c,OverworldLoop .noCollision ld a,$08 - ld [W_WALKCOUNTER],a + ld [wWalkCounter],a jr .moveAhead2 .moveAhead ld a,[$d736] @@ -706,7 +706,7 @@ OverworldLoopLessDelay: ; 0402 (0:0402) .noSpinning call UpdateSprites ; move sprites .moveAhead2 - ld hl,W_FLAGS_CD60 + ld hl,wFlags_0xcd60 res 2,[hl] ld a,[$d700] dec a ; riding a bike? @@ -717,7 +717,7 @@ OverworldLoopLessDelay: ; 0402 (0:0402) call BikeSpeedup ; if riding a bike and not jumping a ledge .normalPlayerSpriteAdvancement call AdvancePlayerSprite - ld a,[W_WALKCOUNTER] + ld a,[wWalkCounter] and a jp nz,CheckMapConnections ; it seems like this check will never succeed (the other place where CheckMapConnections is run works) ; walking animation finished @@ -1214,12 +1214,12 @@ HandleBlackOut: ; 0931 (0:0931) jp Func_5d5f StopMusic: ; 0951 (0:0951) - ld [W_CURCHANNELPOINTER],a + ld [wMusicChannelPointer],a ld a,$ff ld [$c0ee],a call PlaySound .waitLoop - ld a,[W_CURCHANNELPOINTER] + ld a,[wMusicChannelPointer] and a jr nz,.waitLoop jp StopAllSounds @@ -1817,7 +1817,7 @@ LoadCurrentMapView: ; 0caa (0:0caa) ld e,a ld a,[$d360] ld d,a - ld hl,W_SCREENTILESBACKBUFFER + ld hl,wTileMapBackup ld b,$05 .rowLoop ; each loop iteration fills in one row of tile blocks push hl @@ -1859,7 +1859,7 @@ LoadCurrentMapView: ; 0caa (0:0caa) .noCarry2 dec b jr nz,.rowLoop - ld hl,W_SCREENTILESBACKBUFFER + ld hl,wTileMapBackup ld bc,$0000 .adjustForYCoordWithinTileBlock ld a,[W_YBLOCKCOORD] @@ -1874,7 +1874,7 @@ LoadCurrentMapView: ; 0caa (0:0caa) ld bc,$0002 add hl,bc .copyToVisibleAreaBuffer - ld de,W_SCREENTILESBUFFER ; base address for the tiles that are directly transfered to VRAM during V-blank + ld de,wTileMap ; base address for the tiles that are directly transfered to VRAM during V-blank ld b,$12 .rowLoop2 ld c,$14 @@ -1902,7 +1902,7 @@ AdvancePlayerSprite: ; 0d27 (0:0d27) ld b,a ld a,[$c105] ; delta X ld c,a - ld hl,W_WALKCOUNTER ; walking animation counter + ld hl,wWalkCounter ; walking animation counter dec [hl] jr nz,.afterUpdateMapCoords ; if it's the end of the animation, update the player's map coordinates @@ -1913,7 +1913,7 @@ AdvancePlayerSprite: ; 0d27 (0:0d27) add c ld [W_XCOORD],a .afterUpdateMapCoords - ld a,[W_WALKCOUNTER] ; walking animation counter + ld a,[wWalkCounter] ; walking animation counter cp a,$07 jp nz,.scrollBackgroundAndSprites ; if this is the first iteration of the animation @@ -2159,7 +2159,7 @@ ScheduleNorthRowRedraw: ; 0e91 (0:0e91) ret ScheduleRowRedrawHelper: ; 0ea6 (0:0ea6) - ld de,W_SCREENEDGETILES + ld de,wScreenEdgeTiles ld c,$28 .loop ld a,[hli] @@ -2209,7 +2209,7 @@ ScheduleEastColumnRedraw: ; 0ed3 (0:0ed3) ret ScheduleColumnRedrawHelper: ; 0ef2 (0:0ef2) - ld de,W_SCREENEDGETILES + ld de,wScreenEdgeTiles ld c,$12 .loop ld a,[hli] @@ -2335,7 +2335,7 @@ GetJoypadStateOverworld: ; 0f4d (0:0f4d) ld [$cd3a],a ld [$cd38],a ld [$ccd3],a - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a ld [H_CURRENTPRESSEDBUTTONS],a ld hl,$d736 ld a,[hl] @@ -2421,7 +2421,7 @@ RunMapScript: ; 101b (0:101b) ld b, BANK(Func_f225) ld hl, Func_f225 call Bankswitch ; check if the player is pushing a boulder - ld a,[W_FLAGS_CD60] + ld a,[wFlags_0xcd60] bit 1,a ; is the player pushing a boulder? jr z,.afterBoulderEffect ld b, BANK(Func_f2b5) @@ -2781,7 +2781,7 @@ LoadMapData: ; 1241 (0:1241) ld [$d526],a ld [$ffaf],a ld [$ffae],a - ld [W_WALKCOUNTER],a + ld [wWalkCounter],a ld [$d119],a ld [$d11a],a ld [$d3a8],a @@ -2794,7 +2794,7 @@ LoadMapData: ; 1241 (0:1241) call LoadTilesetTilePatternData call LoadCurrentMapView ; copy current map view to VRAM - ld hl,W_SCREENTILESBUFFER + ld hl,wTileMap ld de,$9800 ld b,$12 .vramCopyLoop @@ -3121,7 +3121,7 @@ PartyMenuInit: ; 1420 (0:1420) xor a ld [$cc49],a ld [$cc37],a - ld hl,W_TOPMENUITEMY + ld hl,wTopMenuItemY inc a ld [hli],a ; top menu item Y xor a @@ -3161,7 +3161,7 @@ HandlePartyMenuInput: ; 145a (0:145a) ld b,a xor a ld [$d09b],a - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld [$cc2b],a ld hl,$d730 res 6,[hl] ; turn on letter printing delay @@ -3175,7 +3175,7 @@ HandlePartyMenuInput: ; 145a (0:145a) ld a,[W_NUMINPARTY] and a jr z,.noPokemonChosen - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld [$cf92],a ld hl,W_PARTYMON1 ld b,0 @@ -3204,7 +3204,7 @@ HandlePartyMenuInput: ; 145a (0:145a) call RedrawPartyMenu jr HandlePartyMenuInput .handleSwap - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld [$cf92],a ld b, BANK(Func_13613) ld hl, Func_13613 @@ -3876,15 +3876,15 @@ ClearScreenArea: ; 18c4 (0:18c4) CopyScreenTileBufferToVRAM: ; 18d6 (0:18d6) ld c, $6 ld hl, $0000 - ld de, W_SCREENTILESBUFFER + ld de, wTileMap call InitScreenTileBufferTransferParameters call DelayFrame ld hl, $600 - ld de, W_SCREENTILESBUFFER + 20 * 6 ; $c418 + ld de, wTileMap + 20 * 6 ; $c418 call InitScreenTileBufferTransferParameters call DelayFrame ld hl, $c00 - ld de, W_SCREENTILESBUFFER + 20 * 12 ; $c490 + ld de, wTileMap + 20 * 12 ; $c490 call InitScreenTileBufferTransferParameters jp DelayFrame @@ -3907,7 +3907,7 @@ ClearScreen: ; 190f (0:190f) ; then wait three frames ld bc,$0168 ; tilemap size inc b - ld hl,W_SCREENTILESBUFFER ; TILEMAP_START + ld hl,wTileMap ; TILEMAP_START ld a,$7F ; $7F is blank tile .loop ld [hli],a @@ -4707,7 +4707,7 @@ RedrawExposedScreenEdge: ; 1d01 (0:1d01) dec b jr nz,.redrawRow .redrawColumn - ld hl,W_SCREENEDGETILES + ld hl,wScreenEdgeTiles ld a,[H_SCREENEDGEREDRAWADDR] ld e,a ld a,[H_SCREENEDGEREDRAWADDR + 1] @@ -4736,7 +4736,7 @@ RedrawExposedScreenEdge: ; 1d01 (0:1d01) ld [H_SCREENEDGEREDRAW],a ret .redrawRow - ld hl,W_SCREENEDGETILES + ld hl,wScreenEdgeTiles ld a,[H_SCREENEDGEREDRAWADDR] ld e,a ld a,[H_SCREENEDGEREDRAWADDR + 1] @@ -4770,7 +4770,7 @@ RedrawExposedScreenEdge: ; 1d01 (0:1d01) ret ; This function automatically transfers tile number data from the tile map at -; C3A0 to VRAM during V-blank. Note that it only transfers one third of the +; wTileMap to VRAM during V-blank. Note that it only transfers one third of the ; background per V-blank. It cycles through which third it draws. ; This transfer is turned off when walking around the map, but is turned ; on when talking to sprites, battling, using menus, etc. This is because @@ -5271,7 +5271,7 @@ StopAllSounds: ; 200e (0:200e) ld [$c0ef], a ld [$c0f0], a xor a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld [$c0ee], a ld [$cfca], a dec a @@ -5825,7 +5825,7 @@ asm_2324: ; 2324 (0:2324) ret z .asm_2351 ld a, c - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld a, b ld [$cfca], a ld [$c0ee], a @@ -5883,7 +5883,7 @@ PlayMusic: ; 23a1 (0:23a1) ld b, a ld [$c0ee], a xor a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld a, c ld [$c0ef], a ld [$c0f0], a @@ -5904,7 +5904,7 @@ PlaySound: ; 23b1 (0:23b1) ld [$c02c], a ld [$c02d], a .asm_23c8 - ld a, [W_CURCHANNELPOINTER] + ld a, [wMusicChannelPointer] and a jr z, .asm_23e3 ld a, [$c0ee] @@ -5916,7 +5916,7 @@ PlaySound: ; 23b1 (0:23b1) cp $ff jr nz, .asm_2414 xor a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a .asm_23e3 xor a ld [$c0ee], a @@ -5949,11 +5949,11 @@ PlaySound: ; 23b1 (0:23b1) .asm_2414 ld a, b ld [$cfca], a - ld a, [W_CURCHANNELPOINTER] + ld a, [wMusicChannelPointer] ld [$cfc8], a ld [$cfc9], a ld a, b - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a .asm_2425 pop bc pop de @@ -6677,12 +6677,12 @@ StoreSpriteOutputPointer: ; 2897 (0:2897) ret ResetPlayerSpriteData: ; 28a6 (0:28a6) - ld hl, $c100 + ld hl, wSpriteStateData1 call ResetPlayerSpriteData_ClearSpriteData - ld hl, $c200 + ld hl, wSpriteStateData2 call ResetPlayerSpriteData_ClearSpriteData ld a, $1 - ld [$c100], a + ld [wSpriteStateData1], a ld [$c20e], a ld hl, $c104 ld [hl], $3c ; set Y screen pos @@ -6698,7 +6698,7 @@ ResetPlayerSpriteData_ClearSpriteData: ; 28c4 (0:28c4) jp FillMemory Func_28cb: ; 28cb (0:28cb) - ld a, [W_CURCHANNELPOINTER] + ld a, [wMusicChannelPointer] and a jr nz, .asm_28dc ld a, [$d72c] @@ -6733,10 +6733,10 @@ Func_28cb: ; 28cb (0:28cb) ld [$FF00+$24], a ret .asm_2903 - ld a, [W_CURCHANNELPOINTER] + ld a, [wMusicChannelPointer] ld b, a xor a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld a, $ff ld [$c0ee], a call PlaySound @@ -7015,10 +7015,10 @@ RedisplayStartMenu: ; 2adf (0:2adf) .checkIfUpPressed bit 6,a ; was Up pressed? jr z,.checkIfDownPressed - ld a,[W_CURMENUITEMID] ; menu selection + ld a,[wCurrentMenuItem] ; menu selection and a jr nz,.loop - ld a,[W_OLDMENUITEMID] + ld a,[wLastMenuItem] and a jr nz,.loop ; if the player pressed tried to go past the top item, wrap around to the bottom @@ -7028,7 +7028,7 @@ RedisplayStartMenu: ; 2adf (0:2adf) jr nz,.wrapMenuItemId dec a ; there are only 6 menu items without the pokedex .wrapMenuItemId - ld [W_CURMENUITEMID],a + ld [wCurrentMenuItem],a call EraseMenuCursor jr .loop .checkIfDownPressed @@ -7037,7 +7037,7 @@ RedisplayStartMenu: ; 2adf (0:2adf) ; if the player pressed tried to go past the bottom item, wrap around to the top ld a,[$d74b] bit 5,a ; does the player have the pokedex? - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld c,7 ; there are 7 menu items with the pokedex jr nz,.checkIfPastBottom dec c ; there are only 6 menu items without the pokedex @@ -7046,20 +7046,20 @@ RedisplayStartMenu: ; 2adf (0:2adf) jr nz,.loop ; the player went past the bottom, so wrap to the top xor a - ld [W_CURMENUITEMID],a + ld [wCurrentMenuItem],a call EraseMenuCursor jr .loop .buttonPressed ; A, B, or Start button pressed call PlaceUnfilledArrowMenuCursor - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld [$cc2d],a ; save current menu item ID ld a,b and a,%00001010 ; was the Start button or B button pressed? jp nz,CloseStartMenu - call SaveScreenTilesToBuffer2 ; copy background from W_SCREENTILESBUFFER to W_SCREENTILESBACKBUFFER2 + call SaveScreenTilesToBuffer2 ; copy background from wTileMap to wTileMapBackup2 ld a,[$d74b] bit 5,a ; does the player have the pokedex? - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] jr nz,.displayMenuItem inc a ; adjust position to account for missing pokedex menu item .displayMenuItem @@ -7119,7 +7119,7 @@ SubtractAmountPaidFromMoney: ; 2b96 (0:2b96) ; adds the amount the player sold to their money AddAmountSoldToMoney: ; 2b9e (0:2b9e) - ld de,W_PLAYERMONEY1 + ld de,wPlayerMoney + 2 ld hl,$ffa1 ; total price of items ld c,3 ; length of money in bytes ld a,$0b @@ -7133,7 +7133,7 @@ AddAmountSoldToMoney: ; 2b9e (0:2b9e) ; function to remove an item (in varying quantities) from the player's bag or PC box ; INPUT: -; HL = address of inventory (either W_NUMBAGITEMS or W_NUMBOXITEMS) +; HL = address of inventory (either wNumBagItems or wNumBoxItems) ; [$CF92] = index (within the inventory) of the item to remove ; [$CF96] = quantity to remove RemoveItemFromInventory: ; 2bbb (0:2bbb) @@ -7150,7 +7150,7 @@ RemoveItemFromInventory: ; 2bbb (0:2bbb) ; function to add an item (in varying quantities) to the player's bag or PC box ; INPUT: -; HL = address of inventory (either W_NUMBAGITEMS or W_NUMBOXITEMS) +; HL = address of inventory (either wNumBagItems or wNumBoxItems) ; [$CF91] = item ID ; [$CF96] = item quantity ; sets carry flag if successful, unsets carry flag if unsuccessful @@ -7170,7 +7170,7 @@ AddItemToInventory: ; 2bcf (0:2bcf) ret ; INPUT: -; [W_LISTMENUID] = list menu ID +; [wListMenuID] = list menu ID ; [$cf8b] = address of the list (2 bytes) DisplayListMenuID: ; 2be6 (0:2be6) xor a @@ -7204,7 +7204,7 @@ DisplayListMenuID: ; 2be6 (0:2be6) FuncCoord 4,2 ; coordinates of upper left corner of menu text box ld hl,Coord ld de,$090e ; height and width of menu text box - ld a,[W_LISTMENUID] + ld a,[wListMenuID] and a ; is it a PC pokemon list? jr nz,.skipMovingSprites call UpdateSprites ; move sprites @@ -7216,13 +7216,13 @@ DisplayListMenuID: ; 2be6 (0:2be6) jr c,.setMenuVariables ld a,2 ; max menu item ID is 2 if the list has at least 2 entries .setMenuVariables - ld [W_MAXMENUITEMID],a + ld [wMaxMenuItem],a ld a,4 - ld [W_TOPMENUITEMY],a + ld [wTopMenuItemY],a ld a,5 - ld [W_TOPMENUITEMX],a + ld [wTopMenuItemX],a ld a,%00000111 ; A button, B button, Select button - ld [W_MENUWATCHEDKEYS],a + ld [wMenuWatchedKeys],a ld c,10 call DelayFrames @@ -7243,12 +7243,12 @@ DisplayListMenuIDLoop: ; 2c53 (0:2c53) ld c,80 call DelayFrames xor a - ld [W_CURMENUITEMID],a + ld [wCurrentMenuItem],a ld hl,Coord ld a,l - ld [W_MENUCURSORLOCATION],a + ld [wMenuCursorLocation],a ld a,h - ld [W_MENUCURSORLOCATION + 1],a + ld [wMenuCursorLocation + 1],a jr .buttonAPressed .notOldManBattle call LoadGBPal @@ -7259,16 +7259,16 @@ DisplayListMenuIDLoop: ; 2c53 (0:2c53) bit 0,a ; was the A button pressed? jp z,.checkOtherKeys .buttonAPressed - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] call PlaceUnfilledArrowMenuCursor ld a,$01 ld [$d12e],a ld [$d12d],a xor a ld [$cc37],a - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld c,a - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] add c ld c,a ld a,[$d12a] ; number of list entries @@ -7279,7 +7279,7 @@ DisplayListMenuIDLoop: ; 2c53 (0:2c53) jp c,ExitListMenu ; if so, exit the menu ld a,c ld [$cf92],a - ld a,[W_LISTMENUID] + ld a,[wListMenuID] cp a,ITEMLISTMENU jr nz,.skipMultiplying ; if it's an item menu @@ -7294,13 +7294,13 @@ DisplayListMenuIDLoop: ; 2c53 (0:2c53) add hl,bc ld a,[hl] ld [$cf91],a - ld a,[W_LISTMENUID] + ld a,[wListMenuID] and a ; is it a PC pokemon list? jr z,.pokemonList push hl call GetItemPrice pop hl - ld a,[W_LISTMENUID] + ld a,[wListMenuID] cp a,ITEMLISTMENU jr nz,.skipGettingQuantity ; if it's an item menu @@ -7329,7 +7329,7 @@ DisplayListMenuIDLoop: ; 2c53 (0:2c53) call CopyStringToCF4B ; copy name to $cf4b ld a,$01 ld [$d12e],a - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld [$d12d],a xor a ld [$ffb7],a ; joypad state update flag @@ -7343,7 +7343,7 @@ DisplayListMenuIDLoop: ; 2c53 (0:2c53) jp nz,HandleItemListSwapping ; if so, allow the player to swap menu entries ld b,a bit 7,b ; was Down pressed? - ld hl,W_LISTSCROLLOFFSET + ld hl,wListScrollOffset jr z,.upPressed .downPressed ld a,[hl] @@ -7367,7 +7367,7 @@ DisplayChooseQuantityMenu: ; 2d57 (0:2d57) ld hl,Coord ld b,1 ; height ld c,3 ; width - ld a,[W_LISTMENUID] + ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.drawTextBox ; text box dimensions/coordinates for quantity and price @@ -7379,7 +7379,7 @@ DisplayChooseQuantityMenu: ; 2d57 (0:2d57) call TextBoxBorder FuncCoord 16,10 ld hl,Coord - ld a,[W_LISTMENUID] + ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.printInitialQuantity FuncCoord 8,10 @@ -7425,7 +7425,7 @@ DisplayChooseQuantityMenu: ; 2d57 (0:2d57) .handleNewQuantity FuncCoord 17,10 ld hl,Coord - ld a,[W_LISTMENUID] + ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.printQuantity .printPrice @@ -7496,7 +7496,7 @@ SpacesBetweenQuantityAndPriceText: ; 2e34 (0:2e34) db " @" ExitListMenu: ; 2e3b (0:2e3b) - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld [$d12d],a ld a,$02 ld [$d12e],a @@ -7522,9 +7522,9 @@ PrintListMenuEntries: ; 2e5a (0:2e5a) ld a,[$cf8c] ld d,a inc de ; de = beginning of list entries - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] ld c,a - ld a,[W_LISTMENUID] + ld a,[wListMenuID] cp a,ITEMLISTMENU ld a,c jr nz,.skipMultiplying @@ -7553,7 +7553,7 @@ PrintListMenuEntries: ; 2e5a (0:2e5a) push hl push hl push de - ld a,[W_LISTMENUID] + ld a,[wListMenuID] and a jr z,.pokemonPCMenu cp a,$01 @@ -7575,7 +7575,7 @@ PrintListMenuEntries: ; 2e5a (0:2e5a) ld a,4 sub b ld b,a - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] add b call GetPartyMonName pop hl @@ -7601,7 +7601,7 @@ PrintListMenuEntries: ; 2e5a (0:2e5a) ld c,$a3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes call PrintBCDNumber .skipPrintingItemPrice - ld a,[W_LISTMENUID] + ld a,[wListMenuID] and a jr nz,.skipPrintingPokemonLevel .printPokemonLevel @@ -7622,7 +7622,7 @@ PrintListMenuEntries: ; 2e5a (0:2e5a) ld a,$04 sub b ld b,a - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] add b ld [hl],a call LoadMonData ; load pokemon info @@ -7643,7 +7643,7 @@ PrintListMenuEntries: ; 2e5a (0:2e5a) pop hl pop de inc de - ld a,[W_LISTMENUID] + ld a,[wListMenuID] cp a,ITEMLISTMENU jr nz,.nextListEntry .printItemQuantity @@ -7909,7 +7909,7 @@ UseItem: ; 30bc (0:30bc) ; confirms the item toss and then tosses the item ; INPUT: -; hl = address of inventory (either W_NUMBAGITEMS or W_NUMBOXITEMS) +; hl = address of inventory (either wNumBagItems or wNumBoxItems) ; [$cf91] = item ID ; [$cf92] = index of item within inventory ; [$cf96] = quantity to toss @@ -8050,17 +8050,17 @@ ExecuteCurMapScriptInTable: ; 3160 (0:3160) LoadGymLeaderAndCityName: ; 317f (0:317f) push de - ld de, W_GYMCITYNAME + ld de, wGymCityName ld bc, $11 call CopyData ; load city name pop hl - ld de, W_GYMLEADERNAME + ld de, wGymLeaderName ld bc, $b jp CopyData ; load gym leader name ; reads specific information from trainer header (pointed to at W_TRAINERHEADERPTR) ; a: offset in header data -; 0 -> flag's bit (into W_TRAINERHEADERFLAGBIT) +; 0 -> flag's bit (into wTrainerHeaderFlagBit) ; 2 -> flag's byte ptr (into hl) ; 4 -> before battle text (into hl) ; 6 -> after battle text (into hl) @@ -8079,7 +8079,7 @@ ReadTrainerHeaderInfo: ; 3193 (0:3193) and a jr nz, .nonZeroOffset ld a, [hl] - ld [W_TRAINERHEADERFLAGBIT], a ; store flag's bit + ld [wTrainerHeaderFlagBit], a ; store flag's bit jr .done .nonZeroOffset cp $2 @@ -8116,7 +8116,7 @@ TalkToTrainer: ; 31cc (0:31cc) call ReadTrainerHeaderInfo ; read flag's bit ld a, $2 call ReadTrainerHeaderInfo ; read flag's byte ptr - ld a, [W_TRAINERHEADERFLAGBIT] + ld a, [wTrainerHeaderFlagBit] ld c, a ld b, $2 call HandleBitArray_Bank0 ; read trainer's flag @@ -8139,7 +8139,7 @@ TalkToTrainer: ; 31cc (0:31cc) call PreBattleSaveRegisters ld hl, W_FLAGS_D733 set 4, [hl] ; activate map script index override (index is set below) - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 bit 0, [hl] ; test if player is already being engaged by another trainer ret nz call EngageMapTrainer @@ -8155,7 +8155,7 @@ CheckFightingMapTrainers: ; 3219 (0:3219) jr nz, .trainerEngaging xor a ld [$cf13], a - ld [W_TRAINERHEADERFLAGBIT], a + ld [wTrainerHeaderFlagBit], a ret .trainerEngaging ld hl, W_FLAGS_D733 @@ -8166,7 +8166,7 @@ CheckFightingMapTrainers: ; 3219 (0:3219) ld a, $4c call Predef ld a, BTN_RIGHT | BTN_LEFT | BTN_UP | BTN_DOWN - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a xor a ldh [$b4], a call TrainerWalkUpToPlayer_Bank0 @@ -8178,14 +8178,14 @@ Func_324c: ; 324c (0:324c) ld a, [$d730] and $1 ret nz - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, [$cf13] ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID Func_325d: ; 325d (0:325d) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call InitBattleEnemyParameters ld hl, $d72d set 6, [hl] @@ -8202,14 +8202,14 @@ EndTrainerBattle: ; 3275 (0:3275) set 6, [hl] ld hl, $d72d res 7, [hl] - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 res 0, [hl] ; player is no longer engaged by any trainer ld a, [W_ISINBATTLE] ; $d057 cp $ff jp z, ResetButtonPressedAndMapScript ld a, $2 call ReadTrainerHeaderInfo - ld a, [W_TRAINERHEADERFLAGBIT] + ld a, [wTrainerHeaderFlagBit] ld c, a ld b, $1 call HandleBitArray_Bank0 ; flag trainer as fought @@ -8233,7 +8233,7 @@ EndTrainerBattle: ; 3275 (0:3275) ResetButtonPressedAndMapScript: ; 32c1 (0:32c1) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [H_CURRENTPRESSEDBUTTONS], a ld [H_NEWLYPRESSEDBUTTONS], a ld [H_NEWLYRELEASEDBUTTONS], a @@ -8248,11 +8248,11 @@ TrainerWalkUpToPlayer_Bank0: ; 32cf (0:32cf) ; sets opponent type and mon set/lvl based on the engaging trainer data InitBattleEnemyParameters: ; 32d7 (0:32d7) - ld a, [W_ENGAGEDTRAINERCLASS] + ld a, [wEngagedTrainerClass] ld [W_CUROPPONENT], a ; $d059 ld [W_ENEMYMONORTRAINERCLASS], a cp $c8 - ld a, [W_ENGAGEDTRAINERSETNUM] ; $cd2e + ld a, [wEngagedTrainerSet] ; $cd2e jr c, .noTrainer ld [W_TRAINERNO], a ; $d05d ret @@ -8287,13 +8287,13 @@ CheckForEngagingTrainers: ; 3306 (0:3306) call StoreTrainerHeaderPointer ; set trainer header pointer to current trainer ld a, [de] ld [$cf13], a ; store trainer flag's bit - ld [W_TRAINERHEADERFLAGBIT], a + ld [wTrainerHeaderFlagBit], a cp $ff ret z ld a, $2 call ReadTrainerHeaderInfo ; read trainer flag's byte ptr ld b, $2 - ld a, [W_TRAINERHEADERFLAGBIT] + ld a, [wTrainerHeaderFlagBit] ld c, a call HandleBitArray_Bank0 ; read trainer flag ld a, c @@ -8307,15 +8307,15 @@ CheckForEngagingTrainers: ; 3306 (0:3306) inc hl ld a, [hl] ; read trainer engage distance pop hl - ld [W_TRAINERENGAGEDISTANCE], a + ld [wTrainerEngageDistance], a ld a, [$cf13] swap a - ld [W_TRAINERSPRITEOFFSET], a ; $cd3d + ld [wTrainerSpriteOffset], a ; $cd3d ld a, $39 call Predef ; indirect jump to CheckEngagePlayer (5690f (15:690f)) pop de pop hl - ld a, [W_TRAINERSPRITEOFFSET] ; $cd3d + ld a, [wTrainerSpriteOffset] ; $cd3d and a ret nz ; break if the trainer is engaging .trainerAlreadyFought @@ -8350,9 +8350,9 @@ EngageMapTrainer: ; 336a (0:336a) ld e, a add hl, de ; seek to engaged trainer data ld a, [hli] ; load trainer class - ld [W_ENGAGEDTRAINERCLASS], a + ld [wEngagedTrainerClass], a ld a, [hl] ; load trainer mon set - ld [W_ENEMYMONATTACKMOD], a ; $cd2e + ld [wEnemyMonAttackMod], a ; $cd2e jp PlayTrainerMusic Func_3381: ; 3381 (0:3381) @@ -8408,7 +8408,7 @@ Func_33d4: ; 33d4 (0:33d4) jp TextScriptEnd Func_33dd: ; 33dd (0:33dd) - ld a, [W_FLAGS_CD60] + ld a, [wFlags_0xcd60] bit 0, a ret nz call EngageMapTrainer @@ -8416,7 +8416,7 @@ Func_33dd: ; 33dd (0:33dd) ret PlayTrainerMusic: ; 33e8 (0:33e8) - ld a, [W_ENGAGEDTRAINERCLASS] + ld a, [wEngagedTrainerClass] cp $c8 + SONY1 ret z cp $c8 + SONY2 @@ -8427,13 +8427,13 @@ PlayTrainerMusic: ; 33e8 (0:33e8) and a ret nz xor a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld a, $ff call PlaySound ; stop music ld a, BANK(Music_MeetEvilTrainer) ld [$c0ef], a ld [$c0f0], a - ld a, [W_ENGAGEDTRAINERCLASS] + ld a, [wEngagedTrainerClass] ld b, a ld hl, EvilTrainerList .evilTrainerListLoop @@ -8658,7 +8658,7 @@ asm_3502: ; 3502 (0:3502) ; hl: output list DecodeRLEList: ; 350c (0:350c) xor a - ld [W_RLEBYTECOUNTER], a ; count written bytes here + ld [wRLEByteCount], a ; count written bytes here .listLoop ld a, [de] cp $ff @@ -8668,9 +8668,9 @@ DecodeRLEList: ; 350c (0:350c) ld a, [de] ld b, $0 ld c, a ; number of bytes to be written - ld a, [W_RLEBYTECOUNTER] + ld a, [wRLEByteCount] add c - ld [W_RLEBYTECOUNTER], a ; update total number of written bytes + ld [wRLEByteCount], a ; update total number of written bytes ld a, [H_DOWNARROWBLINKCNT1] ; $FF00+$8b call FillMemory ; write a c-times to output inc de @@ -8678,7 +8678,7 @@ DecodeRLEList: ; 350c (0:350c) .endOfList ld a, $ff ld [hl], a ; write final $ff - ld a, [W_RLEBYTECOUNTER] + ld a, [wRLEByteCount] inc a ; include sentinel in counting ret @@ -8767,7 +8767,7 @@ Func_359e: ; 359e (0:359e) ; sets carry flag if not enough money ; sets zero flag if amounts match exactly HasEnoughMoney: ; 35a6 (0:35a6) - ld de, W_PLAYERMONEY3 ; $d347 + ld de, wPlayerMoney ; $d347 ld hl, $ff9f ld c, $3 jp StringCmp @@ -8776,7 +8776,7 @@ HasEnoughMoney: ; 35a6 (0:35a6) ; sets carry flag if not enough coins ; sets zero flag if amounts match exactly HasEnoughCoins: ; 35b1 (0:35b1) - ld de, W_PLAYERCOINS1 + ld de, wPlayerCoins ld hl, $ffa0 ld c, $2 jp StringCmp @@ -8901,7 +8901,7 @@ MoveSprite_: ; 363d (0:363d) ld [$CD3B],a ld [$CCD3],a dec a - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a ld [$CD3A],a ret @@ -9000,8 +9000,8 @@ UncompressSpriteFromDE: ; 36eb (0:36eb) jp UncompressSpriteData SaveScreenTilesToBuffer2: ; 36f4 (0:36f4) - ld hl, W_SCREENTILESBUFFER - ld de, W_SCREENTILESBACKBUFFER2 + ld hl, wTileMap + ld de, wTileMapBackup2 ld bc, $168 call CopyData ret @@ -9012,27 +9012,27 @@ LoadScreenTilesFromBuffer2: ; 3701 (0:3701) ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba ret -; loads screen tiles stored in W_SCREENTILESBACKBUFFER2 but leaves H_AUTOBGTRANSFERENABLED disabled +; loads screen tiles stored in wTileMapBackup2 but leaves H_AUTOBGTRANSFERENABLED disabled LoadScreenTilesFromBuffer2DisableBGTransfer: ; 3709 (0:3709) xor a ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba - ld hl, W_SCREENTILESBACKBUFFER2 - ld de, W_SCREENTILESBUFFER + ld hl, wTileMapBackup2 + ld de, wTileMap ld bc, $168 call CopyData ret SaveScreenTilesToBuffer1: ; 3719 (0:3719) - ld hl, W_SCREENTILESBUFFER - ld de, W_SCREENTILESBACKBUFFER + ld hl, wTileMap + ld de, wTileMapBackup ld bc, $168 jp CopyData LoadScreenTilesFromBuffer1: ; 3725 (0:3725) xor a ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba - ld hl, W_SCREENTILESBACKBUFFER - ld de, W_SCREENTILESBUFFER + ld hl, wTileMapBackup + ld de, wTileMap ld bc, $168 call CopyData ld a, $1 @@ -9164,7 +9164,7 @@ GetName: ; 376b (0:376b) GetItemPrice: ; 37df (0:37df) ld a, [H_LOADEDROMBANK] push af - ld a, [W_LISTMENUID] ; $cf94 + ld a, [wListMenuID] ; $cf94 cp $1 ld a, $1 jr nz, .asm_37ed @@ -9422,7 +9422,7 @@ CopyDataUntil: ; 3913 (0:3913) ret ; Function to remove a pokemon from the party or the current box. -; W_WHICHPOKEMON determines the pokemon. +; wWhichPokemon determines the pokemon. ; [$cf95] == 0 specifies the party. ; [$cf95] != 0 specifies the current box. RemovePokemon: ; 391f (0:391f) @@ -9776,7 +9776,7 @@ HandleMenuInputPokemonSelection: ; 3ac2 (0:3ac2) ld hl,Coord call HandleDownArrowBlinkTiming ; blink down arrow (if any) pop hl - ld a,[W_MENUJOYPADPOLLCOUNT] + ld a,[wMenuJoypadPollCount] dec a jr z,.giveUpWaiting jr .loop2 @@ -9787,7 +9787,7 @@ HandleMenuInputPokemonSelection: ; 3ac2 (0:3ac2) pop af ld [H_DOWNARROWBLINKCNT1],a ; restore previous values xor a - ld [W_MENUWRAPPINGENABLED],a ; disable menu wrapping + ld [wMenuWrappingEnabled],a ; disable menu wrapping ret .keyPressed xor a @@ -9797,40 +9797,40 @@ HandleMenuInputPokemonSelection: ; 3ac2 (0:3ac2) bit 6,a ; pressed Up key? jr z,.checkIfDownPressed .upPressed - ld a,[W_CURMENUITEMID] ; selected menu item + ld a,[wCurrentMenuItem] ; selected menu item and a ; already at the top of the menu? jr z,.alreadyAtTop .notAtTop dec a - ld [W_CURMENUITEMID],a ; move selected menu item up one space + ld [wCurrentMenuItem],a ; move selected menu item up one space jr .checkOtherKeys .alreadyAtTop - ld a,[W_MENUWRAPPINGENABLED] + ld a,[wMenuWrappingEnabled] and a ; is wrapping around enabled? jr z,.noWrappingAround - ld a,[W_MAXMENUITEMID] - ld [W_CURMENUITEMID],a ; wrap to the bottom of the menu + ld a,[wMaxMenuItem] + ld [wCurrentMenuItem],a ; wrap to the bottom of the menu jr .checkOtherKeys .checkIfDownPressed bit 7,a jr z,.checkOtherKeys .downPressed - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] inc a ld c,a - ld a,[W_MAXMENUITEMID] + ld a,[wMaxMenuItem] cp c jr nc,.notAtBottom .alreadyAtBottom - ld a,[W_MENUWRAPPINGENABLED] + ld a,[wMenuWrappingEnabled] and a ; is wrapping around enabled? jr z,.noWrappingAround ld c,$00 ; wrap from bottom to top .notAtBottom ld a,c - ld [W_CURMENUITEMID],a + ld [wCurrentMenuItem],a .checkOtherKeys - ld a,[W_MENUWATCHEDKEYS] + ld a,[wMenuWatchedKeys] and b ; does the menu care about any of the pressed keys? jp z,.loop1 .checkIfAButtonOrBButtonPressed @@ -9839,7 +9839,7 @@ HandleMenuInputPokemonSelection: ; 3ac2 (0:3ac2) jr z,.skipPlayingSound .AButtonOrBButtonPressed push hl - ld hl,W_FLAGS_CD60 + ld hl,wFlags_0xcd60 bit 5,[hl] pop hl jr nz,.skipPlayingSound @@ -9851,7 +9851,7 @@ HandleMenuInputPokemonSelection: ; 3ac2 (0:3ac2) pop af ld [H_DOWNARROWBLINKCNT1],a ; restore previous values xor a - ld [W_MENUWRAPPINGENABLED],a ; disable menu wrapping + ld [wMenuWrappingEnabled],a ; disable menu wrapping ld a,[$ffb5] ret .noWrappingAround @@ -9861,22 +9861,22 @@ HandleMenuInputPokemonSelection: ; 3ac2 (0:3ac2) jr .checkIfAButtonOrBButtonPressed PlaceMenuCursor: ; 3b7c (0:3b7c) - ld a,[W_TOPMENUITEMY] + ld a,[wTopMenuItemY] and a ; is the y coordinate 0? jr z,.adjustForXCoord - ld hl,W_SCREENTILESBUFFER + ld hl,wTileMap ld bc,20 ; screen width .topMenuItemLoop add hl,bc dec a jr nz,.topMenuItemLoop .adjustForXCoord - ld a,[W_TOPMENUITEMX] + ld a,[wTopMenuItemX] ld b,$00 ld c,a add hl,bc push hl - ld a,[W_OLDMENUITEMID] + ld a,[wLastMenuItem] and a ; was the previous menu id 0? jr z,.checkForArrow1 push af @@ -9898,11 +9898,11 @@ PlaceMenuCursor: ; 3b7c (0:3b7c) cp a,"▶" ; was an arrow next to the previously selected menu item? jr nz,.skipClearingArrow .clearArrow - ld a,[W_TILEBEHINDCURSOR] + ld a,[wTileBehindCursor] ld [hl],a .skipClearingArrow pop hl - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] and a jr z,.checkForArrow2 push af @@ -9923,16 +9923,16 @@ PlaceMenuCursor: ; 3b7c (0:3b7c) ld a,[hl] cp a,"▶" ; has the right arrow already been placed? jr z,.skipSavingTile ; if so, don't lose the saved tile - ld [W_TILEBEHINDCURSOR],a ; save tile before overwriting with right arrow + ld [wTileBehindCursor],a ; save tile before overwriting with right arrow .skipSavingTile ld a,"▶" ; place right arrow ld [hl],a ld a,l - ld [W_MENUCURSORLOCATION],a + ld [wMenuCursorLocation],a ld a,h - ld [W_MENUCURSORLOCATION + 1],a - ld a,[W_CURMENUITEMID] - ld [W_OLDMENUITEMID],a + ld [wMenuCursorLocation + 1],a + ld a,[wCurrentMenuItem] + ld [wLastMenuItem],a ret ; This is used to mark a menu cursor other than the one currently being @@ -9941,9 +9941,9 @@ PlaceMenuCursor: ; 3b7c (0:3b7c) ; this is used to mark the item that was first chosen to be swapped. PlaceUnfilledArrowMenuCursor: ; 3bec (0:3bec) ld b,a - ld a,[W_MENUCURSORLOCATION] + ld a,[wMenuCursorLocation] ld l,a - ld a,[W_MENUCURSORLOCATION + 1] + ld a,[wMenuCursorLocation + 1] ld h,a ld [hl],$ec ; outline of right arrow ld a,b @@ -9951,9 +9951,9 @@ PlaceUnfilledArrowMenuCursor: ; 3bec (0:3bec) ; Replaces the menu cursor with a blank space. EraseMenuCursor: ; 3bf9 (0:3bf9) - ld a,[W_MENUCURSORLOCATION] + ld a,[wMenuCursorLocation] ld l,a - ld a,[W_MENUCURSORLOCATION + 1] + ld a,[wMenuCursorLocation + 1] ld h,a ld [hl]," " ret @@ -10406,7 +10406,7 @@ GiveItem: ; 3e2e (0:3e2e) ld [$cf91], a ld a, c ld [$cf96], a - ld hl,W_NUMBAGITEMS + ld hl,wNumBagItems call AddItemToInventory ret nc call GetItemName ; $2fcf @@ -10692,17 +10692,17 @@ Func_40b0: ; 40b0 (1:40b0) ld [$cf10], a ld [H_CURRENTPRESSEDBUTTONS], a ld [$cc57], a - ld [W_FLAGS_CD60], a + ld [wFlags_0xcd60], a ld [$FF00+$9f], a ld [$FF00+$a0], a ld [$FF00+$a1], a call HasEnoughMoney jr c, .asm_40ff - ld a, [W_PLAYERMONEY3] ; $d347 + ld a, [wPlayerMoney] ; $d347 ld [$FF00+$9f], a - ld a, [W_PLAYERMONEY2] ; $d348 + ld a, [wPlayerMoney + 1] ; $d348 ld [$FF00+$a0], a - ld a, [W_PLAYERMONEY1] ; $d349 + ld a, [wPlayerMoney + 2] ; $d349 ld [$FF00+$a1], a xor a ld [$FF00+$a2], a @@ -10712,18 +10712,18 @@ Func_40b0: ; 40b0 (1:40b0) ld a, $d call Predef ; indirect jump to Func_f71e (f71e (3:771e)) ld a, [$FF00+$a2] - ld [W_PLAYERMONEY3], a ; $d347 + ld [wPlayerMoney], a ; $d347 ld a, [$FF00+$a3] - ld [W_PLAYERMONEY2], a ; $d348 + ld [wPlayerMoney + 1], a ; $d348 ld a, [$FF00+$a4] - ld [W_PLAYERMONEY1], a ; $d349 + ld [wPlayerMoney + 2], a ; $d349 .asm_40ff ld hl, $d732 set 2, [hl] res 3, [hl] set 6, [hl] ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $7 jp Predef ; indirect jump to HealParty (f6a5 (3:76a5)) @@ -10931,7 +10931,7 @@ IF _BLUE ld a,SQUIRTLE ; which Pokemon to show first on the title screen ENDC - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d call Func_4524 ld a, $9b call Func_4533 @@ -11021,7 +11021,7 @@ INCBIN "baserom.gbc",$43db,$43ea - $43db call Func_4496 jr .asm_443b .asm_4459 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d call PlayCry call WaitForSoundToFinish call GBPalWhiteOutWithDelay3 @@ -11060,7 +11060,7 @@ Func_4496: ; 4496 (1:4496) ld hl, TitleMons ; $4588 add hl, bc ld a, [hl] - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d cp [hl] jr z, .asm_449b ld [hl], a @@ -11102,8 +11102,8 @@ Func_44dd: ; 44dd (1:44dd) call FarCopyData2 call CleanLCD_OAM xor a - ld [W_WHICHTRADE], a ; $cd3d - ld hl, W_OAMBUFFER + ld [wWhichTrade], a ; $cd3d + ld hl, wOAMBuffer ld de, $605a ld b, $7 .asm_44fa @@ -11116,10 +11116,10 @@ Func_44dd: ; 44dd (1:44dd) ld [hli], a add $8 ld e, a - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [hli], a inc a - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d inc hl dec c jr nz, .asm_44fd @@ -11282,7 +11282,7 @@ LoadMonData_: ; 45b6 (1:45b6) ld a,[$cc49] cp a,$01 jr c,.getMonEntry - ld hl,$d8a4 ; enemy pokemon 1 data + ld hl,wEnemyMons ; enemy pokemon 1 data jr z,.getMonEntry cp a,$02 ld hl,W_BOXMON1DATA ; box pokemon 1 data @@ -11518,7 +11518,7 @@ UnusedNames: ; 4a92 (1:4a92) INCBIN "baserom.gbc",$4b09,$4b0f - $4b09 -; calculates the OAM data for all currently visible sprites and writes it to W_OAMBUFFER +; calculates the OAM data for all currently visible sprites and writes it to wOAMBuffer PrepareOAMData: ; 4b0f (1:4b0f) ld a, [$cfcb] dec a @@ -11580,7 +11580,7 @@ PrepareOAMData: ; 4b0f (1:4b0f) call Func_4bd1 ld a, [$FF00+$90] ld e, a - ld d, $c3 ; W_OAMBUFFER+x is buffer for OAM data + ld d, $c3 ; wOAMBuffer+x is buffer for OAM data .spriteTilesLoop ; loops 4 times for the 4 tiles a sprite consists of ld a, [$FF00+$92] ; temp for sprite Y position add $10 ; Y=16 is top of screen (Y=0 is invisible) @@ -12052,13 +12052,13 @@ NoMoreRoomForItemText: ; 4e2c (1:4e2c) db "@" UpdatePlayerSprite: ; 4e31 (1:4e31) - ld a, [$c200] + ld a, [wSpriteStateData2] and a jr z, .asm_4e41 cp $ff jr z, .asm_4e4a dec a - ld [$c200], a + ld [wSpriteStateData2], a jr .asm_4e4a .asm_4e41 FuncCoord 8, 9 ; $c45c @@ -12073,7 +12073,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31) .asm_4e50 call Func_4c70 ld h, $c1 - ld a, [W_WALKCOUNTER] ; $cfc5 + ld a, [wWalkCounter] ; $cfc5 and a jr nz, .asm_4e90 ld a, [$d528] @@ -12163,7 +12163,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) add l ld l, a ld a, [hl] ; read movement byte 2 - ld [W_CURSPRITEMOVEMENT2], a + ld [wCurSpriteMovement2], a ld h, $c1 ld a, [H_CURRENTSPRITEOFFSET] ld l, a @@ -12189,7 +12189,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) jp z, UpdateSpriteMovementDelay ; c1x1 == 2 cp $3 jp z, UpdateSpriteInWalkingAnimation ; c1x1 == 3 - ld a, [W_WALKCOUNTER] ; $cfc5 + ld a, [wWalkCounter] ; $cfc5 and a ret nz ; don't do anything yet if player is currently moving (redundant, already tested in CheckSpriteAvailability) call InitializeSpriteScreenPosition @@ -12234,7 +12234,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) call GenRandom .asm_4f5f ld b, a - ld a, [W_CURSPRITEMOVEMENT2] + ld a, [wCurSpriteMovement2] cp $d0 jr z, .moveDown ; movement byte 2 = $d0 forces down cp $d1 @@ -12246,7 +12246,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) ld a, b cp $40 ; a < $40: down (or left) jr nc, .notDown - ld a, [W_CURSPRITEMOVEMENT2] + ld a, [wCurSpriteMovement2] cp $2 jr z, .moveLeft ; movement byte 2 = $2 only allows left or right .moveDown @@ -12259,7 +12259,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) .notDown cp $80 ; $40 <= a < $80: up (or right) jr nc, .notUp - ld a, [W_CURSPRITEMOVEMENT2] + ld a, [wCurSpriteMovement2] cp $2 jr z, .moveRight ; movement byte 2 = $2 only allows left or right .moveUp @@ -12271,7 +12271,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) .notUp cp $c0 ; $80 <= a < $c0: left (or up) jr nc, .notLeft - ld a, [W_CURSPRITEMOVEMENT2] + ld a, [wCurSpriteMovement2] cp $1 jr z, .moveUp ; movement byte 2 = $1 only allows up or down .moveLeft @@ -12281,7 +12281,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) ld bc, $208 jr TryWalking .notLeft ; $c0 <= a: right (or down) - ld a, [W_CURSPRITEMOVEMENT2] + ld a, [wCurSpriteMovement2] cp $1 jr z, .moveDown ; movement byte 2 = $1 only allows up or down .moveRight @@ -12571,7 +12571,7 @@ CheckSpriteAvailability: ; 50dc (1:50dc) jr .done .spriteVisible ld c, a - ld a, [W_WALKCOUNTER] ; $cfc5 + ld a, [wWalkCounter] ; $cfc5 and a jr nz, .done ; if player is currently walking, we're done call UpdateSpriteImage @@ -12744,13 +12744,13 @@ getTileSpriteStandsOn: ; 5207 (1:5207) add $14 ; screen X tile + 20 ld d, $0 ld e, a - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap add hl, bc add hl, bc add hl, bc add hl, bc add hl, bc - add hl, de ; W_SCREENTILESBUFFER + 20*(screen Y tile + 1) + screen X tile + add hl, de ; wTileMap + 20*(screen Y tile + 1) + screen X tile ret ; loads [de+a] into a @@ -12845,7 +12845,7 @@ Func_52b7: ; 52b7 (1:52b7) ld a, $6 ld b, a asm_52ba: ; 52ba (1:52ba) - ld hl, $c100 + ld hl, wSpriteStateData1 ld a, [H_CURRENTSPRITEOFFSET] add l add b @@ -12853,7 +12853,7 @@ asm_52ba: ; 52ba (1:52ba) ret Func_52c3: ; 52c3 (1:52c3) - ld hl, $c200 + ld hl, wSpriteStateData2 ld a, [H_CURRENTSPRITEOFFSET] add $e ld l, a @@ -12861,7 +12861,7 @@ Func_52c3: ; 52c3 (1:52c3) dec a swap a ld b, a - ld hl, $c100 + ld hl, wSpriteStateData1 ld a, [H_CURRENTSPRITEOFFSET] add $9 ld l, a @@ -12880,7 +12880,7 @@ Func_52c3: ; 52c3 (1:52c3) ld b, a ld [$FF00+$e9], a call Func_5301 - ld hl, $c100 + ld hl, wSpriteStateData1 ld a, [H_CURRENTSPRITEOFFSET] add $2 ld l, a @@ -12953,7 +12953,7 @@ Func_5317: ; 5317 (1:5317) ld [hli], a dec b jr nz, .asm_535d - ld hl, W_SCREENTILESBACKBUFFER + ld hl, wTileMapBackup ld a, $fd ld [hli], a ld [hli], a @@ -13025,7 +13025,7 @@ Func_5317: ; 5317 (1:5317) ld a, $8 ld [rIE], a ; $FF00+$ff ld hl, $d141 - ld de, W_SCREENTILESBACKBUFFER2 + ld de, wTileMapBackup2 ld bc, $11 call Func_216f ld a, $fe @@ -13036,7 +13036,7 @@ Func_5317: ; 5317 (1:5317) call Func_216f ld a, $fe ld [de], a - ld hl, W_SCREENTILESBACKBUFFER + ld hl, wTileMapBackup ld de, $c5d0 ld bc, $c8 call Func_216f @@ -13047,7 +13047,7 @@ Func_5317: ; 5317 (1:5317) ld a, [$FF00+$aa] cp $2 jr z, .asm_5431 - ld hl, W_SCREENTILESBACKBUFFER2 + ld hl, wTileMapBackup2 .asm_5415 ld a, [hli] and a @@ -13088,7 +13088,7 @@ Func_5317: ; 5317 (1:5317) inc de dec c jr nz, .asm_5446 - ld de, W_ENEMYMONCOUNT ; $d89c + ld de, wEnemyPartyCount ; $d89c ld bc, $194 .asm_5456 ld a, [hli] @@ -13100,7 +13100,7 @@ Func_5317: ; 5317 (1:5317) ld a, b or c jr nz, .asm_5456 - ld de, W_SCREENTILESBACKBUFFER + ld de, wTileMapBackup ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA) ld c, $2 .asm_546a @@ -13126,7 +13126,7 @@ Func_5317: ; 5317 (1:5317) pop hl jr .asm_546a .asm_5489 - ld hl, W_PARTYMON6_MOVE4PP ; $d267 + ld hl, W_PARTYMON6DATA + W_PARTYMON1_MOVE4PP - W_PARTYMON1DATA ; $d267 dec c jr nz, .asm_546a ld de, $c5d0 @@ -13266,7 +13266,7 @@ Func_5530 ld hl, Func_39bd5 ld b, $e call Bankswitch - ld hl, $d8a4 + ld hl, wEnemyMons call Func_57d6 jp .asm_565b .asm_55b0 @@ -13538,7 +13538,7 @@ Func_57d6: jp Func_57a2 Func_57f2: - ld hl, $c3a0 + ld hl, wTileMap ld b, $6 ld c, $12 call Func_5ab3 @@ -13677,7 +13677,7 @@ Func_5849: ld de, $cd4e ld bc, $000b call CopyData - ld hl, $d8a4 + ld hl, wEnemyMons ld a, [$cd3e] ld bc, $002c call AddNTimes @@ -13707,7 +13707,7 @@ Func_5849: add hl, de ld a, [hl] ld [$cf91], a - ld hl, $d8a4 + ld hl, wEnemyMons ld a, c ld bc, $002c call AddNTimes @@ -13728,7 +13728,7 @@ Func_5849: ld a, [hl] ld [$cd3e], a ld a, $a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld a, $2 ld [$c0f0], a ld a, $e5 @@ -13825,7 +13825,7 @@ Func_5a5f: ; 5a5f (1:5a5f) ld [W_ISLINKBATTLE], a ; $d12b ld [$FF00+$b5], a ld a, $a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld a, BANK(Music_Celadon) ld [$c0f0], a ld a, (Music_Celadon - $4000) / 3 @@ -14040,7 +14040,7 @@ Func_5c0a: ; 5c0a (1:5c0a) xor a ld [$cd37], a ld [$d72d], a - ld hl, W_TOPMENUITEMY ; $cc24 + ld hl, wTopMenuItemY ; $cc24 ld a, $7 ld [hli], a ld a, $6 @@ -14060,7 +14060,7 @@ Func_5c0a: ; 5c0a (1:5c0a) add a add a ld b, a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 add b add $d0 ld [$cc42], a @@ -14096,7 +14096,7 @@ Func_5c0a: ; 5c0a (1:5c0a) ld a, b ld [$cc42], a and $3 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 .asm_5ca1 ld a, [$FF00+$aa] cp $2 @@ -14112,7 +14112,7 @@ Func_5c0a: ; 5c0a (1:5c0a) ld a, [$cc42] and $8 jr nz, .asm_5ccc - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp $2 jr z, .asm_5ccc ld c, d @@ -14137,12 +14137,12 @@ Func_5c0a: ; 5c0a (1:5c0a) ld a, [$cc42] and $8 jr nz, .asm_5d2d - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp $2 jr z, .asm_5d2d xor a ld [$d700], a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a ld a, $f0 jr nz, .asm_5cfc @@ -14161,7 +14161,7 @@ Func_5c0a: ; 5c0a (1:5c0a) ld c, $14 call DelayFrames xor a - ld [W_MENUJOYPADPOLLCOUNT], a ; $cc34 + ld [wMenuJoypadPollCount], a ; $cc34 ld [$cc42], a inc a ld [W_ISLINKBATTLE], a ; $d12b @@ -14169,7 +14169,7 @@ Func_5c0a: ; 5c0a (1:5c0a) jr Func_5d5f .asm_5d2d xor a - ld [W_MENUJOYPADPOLLCOUNT], a ; $cc34 + ld [wMenuJoypadPollCount], a ; $cc34 call Delay3 call Func_72d7 ld hl, UnnamedText_5d4d ; $5d4d @@ -14290,7 +14290,7 @@ Func_5e2f: ; 5e2f (1:5e2f) Func_5e42: ; 5e42 (1:5e42) push hl - ld hl, W_OWNEDPOKEMON ; $d2f7 + ld hl, wPokedexOwned ; $d2f7 ld b, $13 call CountSetBits pop hl @@ -14347,16 +14347,16 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) ld de,OptionMenuCancelText call PlaceString xor a - ld [W_CURMENUITEMID],a - ld [W_OLDMENUITEMID],a + ld [wCurrentMenuItem],a + ld [wLastMenuItem],a inc a ld [$d358],a ld [$cd40],a ld a,3 ; text speed cursor Y coordinate - ld [W_TOPMENUITEMY],a + ld [wTopMenuItemY],a call SetCursorPositionsFromOptions ld a,[$cd3d] ; text speed cursor X coordinate - ld [W_TOPMENUITEMX],a + ld [wTopMenuItemX],a ld a,$01 ld [H_AUTOBGTRANSFERENABLED],a ; enable auto background transfer call Delay3 @@ -14375,7 +14375,7 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) jr nz,.exitMenu bit 0,b ; A button pressed? jr z,.checkDirectionKeys - ld a,[W_TOPMENUITEMY] + ld a,[wTopMenuItemY] cp a,16 ; is the cursor on Cancel? jr nz,.loop .exitMenu @@ -14383,11 +14383,11 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) call PlaySound ; play sound ret .eraseOldMenuCursor - ld [W_TOPMENUITEMX],a + ld [wTopMenuItemX],a call EraseMenuCursor jp .loop .checkDirectionKeys - ld a,[W_TOPMENUITEMY] + ld a,[wTopMenuItemY] bit 7,b ; Down pressed? jr nz,.downPressed bit 6,b ; Up pressed? @@ -14433,9 +14433,9 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) inc hl .updateMenuVariables add b - ld [W_TOPMENUITEMY],a + ld [wTopMenuItemY],a ld a,[hl] - ld [W_TOPMENUITEMX],a + ld [wTopMenuItemX],a call PlaceUnfilledArrowMenuCursor jp .loop .cursorInBattleAnimation @@ -14617,7 +14617,7 @@ Func_60ca: ; 60ca (1:60ca) ld bc, $d8a xor a call FillMemory - ld hl, $c100 + ld hl, wSpriteStateData1 ld bc, $200 xor a call FillMemory @@ -14741,7 +14741,7 @@ Function61BC: ; 61bc (1:61bc) ld [$C0EF],a ld [$C0F0],a ld a,$A - ld [W_CURCHANNELPOINTER],a + ld [wMusicChannelPointer],a ld a,$FF ld [$C0EE],a call PlaySound ; stop music @@ -15144,7 +15144,7 @@ AskForMonNickname: ; 64eb (1:64eb) push hl ld a, [W_ISINBATTLE] ; $d057 dec a - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $4 ld c, $b call z, ClearScreenArea ; only if in wild batle @@ -15160,7 +15160,7 @@ AskForMonNickname: ; 64eb (1:64eb) ld [$d125], a call DisplayTextBoxID pop hl - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jr nz, .asm_654c ld a, [$cfcb] @@ -15209,7 +15209,7 @@ Func_655c: ; 655c (1:655c) jr z, .asm_6594 ld hl, W_PARTYMON1NAME ; $d2b5 ld bc, $b - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call AddNTimes ld e, l ld d, h @@ -15243,15 +15243,15 @@ Func_6596: ; 6596 (1:6596) call TextBoxBorder call Func_68f8 ld a, $3 - ld [W_TOPMENUITEMY], a ; $cc24 + ld [wTopMenuItemY], a ; $cc24 ld a, $1 - ld [W_TOPMENUITEMX], a ; $cc25 - ld [W_OLDMENUITEMID], a ; $cc2a - ld [W_CURMENUITEMID], a ; $cc26 + ld [wTopMenuItemX], a ; $cc25 + ld [wLastMenuItem], a ; $cc2a + ld [wCurrentMenuItem], a ; $cc26 ld a, $ff - ld [W_MENUWATCHEDKEYS], a ; $cc29 + ld [wMenuWatchedKeys], a ; $cc29 ld a, $7 - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 ld a, $50 ld [$cf4b], a xor a @@ -15270,13 +15270,13 @@ Func_6596: ; 6596 (1:6596) .asm_65fc call PlaceMenuCursor .asm_65ff - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 push af ld b, BANK(Func_716f7) ld hl, Func_716f7 call Bankswitch ; indirect jump to Func_716f7 (716f7 (1c:56f7)) pop af - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 call GetJoypadStateLowSensitivity ld a, [H_NEWLYPRESSEDBUTTONS] and a @@ -15353,21 +15353,21 @@ Func_6596: ; 6596 (1:6596) ld [$ceea], a ret .asm_6692 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp $5 jr nz, .asm_66a0 - ld a, [W_TOPMENUITEMX] ; $cc25 + ld a, [wTopMenuItemX] ; $cc25 cp $11 jr z, .asm_668c .asm_66a0 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp $6 jr nz, .asm_66ae - ld a, [W_TOPMENUITEMX] ; $cc25 + ld a, [wTopMenuItemX] ; $cc25 cp $1 jr z, .asm_667e .asm_66ae - ld hl, W_MENUCURSORLOCATION ; $cc30 + ld hl, wMenuCursorLocation ; $cc30 ld a, [hli] ld h, [hl] ld l, a @@ -15416,10 +15416,10 @@ Func_6596: ; 6596 (1:6596) ld [hl], $50 ret .asm_6702 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp $6 ret z - ld a, [W_TOPMENUITEMX] ; $cc25 + ld a, [wTopMenuItemX] ; $cc25 cp $11 jp z, .asm_6714 inc a @@ -15429,10 +15429,10 @@ Func_6596: ; 6596 (1:6596) ld a, $1 jr .asm_6755 .asm_6718 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp $6 ret z - ld a, [W_TOPMENUITEMX] ; $cc25 + ld a, [wTopMenuItemX] ; $cc25 dec a jp z, .asm_6728 dec a @@ -15441,30 +15441,30 @@ Func_6596: ; 6596 (1:6596) ld a, $11 jr .asm_6755 .asm_672c - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 dec a - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 and a ret nz ld a, $6 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld a, $1 jr .asm_6755 .asm_673e - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 inc a - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 cp $7 jr nz, .asm_6750 ld a, $1 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 jr .asm_6755 .asm_6750 cp $6 ret nz ld a, $1 .asm_6755 - ld [W_TOPMENUITEMX], a ; $cc25 + ld [wTopMenuItemX], a ; $cc25 jp EraseMenuCursor Func_675b: ; 675b (1:675b) @@ -15552,9 +15552,9 @@ Func_680e: ; 680e (1:680e) jr nz, .asm_6867 call EraseMenuCursor ld a, $11 - ld [W_TOPMENUITEMX], a ; $cc25 + ld [wTopMenuItemX], a ; $cc25 ld a, $5 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld a, [$d07d] cp $2 ld a, $9 @@ -15653,7 +15653,7 @@ Func_695d: ; 695d (1:695d) call Unnamed_6a12 ld de, DefaultNamesPlayer ; $6aa8 call Func_6a6c - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jr z, .asm_697a ld hl, DefaultNamesPlayerList ; $6af2 @@ -15686,7 +15686,7 @@ Func_69a4: ; 69a4 (1:69a4) call Unnamed_6a12 ; 0x69a4 call 0x6a12 ld de, DefaultNamesRival call Func_6a6c - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jr z, .asm_69c1 ld hl, DefaultNamesRivalList @@ -15717,7 +15717,7 @@ UnnamedText_69e7: ; 69e7 (1:69e7) Func_69ec: ; 69ec (1:69ec) push de - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld bc, $c0b call ClearScreenArea ld c, $a @@ -15808,7 +15808,7 @@ asm_6a19: ; 6a19 (1:6a19) Func_6a6c: ; 6a6c (1:6a6c) push de - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $a ld c, $9 call TextBoxBorder @@ -15822,15 +15822,15 @@ Func_6a6c: ; 6a6c (1:6a6c) call PlaceString call UpdateSprites xor a - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_OLDMENUITEMID], a ; $cc2a + ld [wCurrentMenuItem], a ; $cc26 + ld [wLastMenuItem], a ; $cc2a inc a - ld [W_TOPMENUITEMX], a ; $cc25 - ld [W_MENUWATCHEDKEYS], a ; $cc29 + ld [wTopMenuItemX], a ; $cc25 + ld [wMenuWatchedKeys], a ; $cc29 inc a - ld [W_TOPMENUITEMY], a ; $cc24 + ld [wTopMenuItemY], a ; $cc24 inc a - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 jp HandleMenuInput .namestring ; 6aa3 (1:6aa3) @@ -15889,12 +15889,12 @@ TextTerminator_6b20: ; 6b20 (1:6b20) ; subtracts the amount the player paid from their money ; sets carry flag if there is enough money and unsets carry flag if not SubtractAmountPaidFromMoney_: ; 6b21 (1:6b21) - ld de,W_PLAYERMONEY3 + ld de,wPlayerMoney ld hl,$ff9f ; total price of items ld c,3 ; length of money in bytes call StringCmp ret c - ld de,W_PLAYERMONEY1 + ld de,wPlayerMoney + 2 ld hl,$ffa1 ; total price of items ld c,3 ; length of money in bytes ld a,$0c @@ -15906,7 +15906,7 @@ SubtractAmountPaidFromMoney_: ; 6b21 (1:6b21) ret HandleItemListSwapping: ; 6b44 (1:6b44) - ld a,[W_LISTMENUID] + ld a,[wListMenuID] cp a,ITEMLISTMENU jp nz,DisplayListMenuIDLoop ; only rearrange item list menus push hl @@ -15915,9 +15915,9 @@ HandleItemListSwapping: ; 6b44 (1:6b44) ld h,[hl] ld l,a inc hl ; hl = beginning of list entries - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld b,a - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] add b add a ld c,a @@ -15931,20 +15931,20 @@ HandleItemListSwapping: ; 6b44 (1:6b44) and a ; has the first item to swap already been chosen? jr nz,.swapItems ; if not, set the currently selected item as the first item - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] inc a ld b,a - ld a,[W_LISTSCROLLOFFSET] ; index of top (visible) menu item within the list + ld a,[wListScrollOffset] ; index of top (visible) menu item within the list add b ld [$cc35],a ; ID of item chosen for swapping (counts from 1) ld c,20 call DelayFrames jp DisplayListMenuIDLoop .swapItems - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] inc a ld b,a - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] add b ld b,a ld a,[$cc35] ; ID of item chosen for swapping (counts from 1) @@ -15963,9 +15963,9 @@ HandleItemListSwapping: ; 6b44 (1:6b44) inc hl ; hl = beginning of list entries ld d,h ld e,l ; de = beginning of list entries - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld b,a - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] add b add a ld c,a @@ -16027,7 +16027,7 @@ HandleItemListSwapping: ; 6b44 (1:6b44) ld [$d12a],a ; update number of items variable cp a,1 jr nz,.skipSettingMaxMenuItemID - ld [W_MAXMENUITEMID],a ; if the number of items is only one now, update the max menu item ID + ld [wMaxMenuItem],a ; if the number of items is only one now, update the max menu item ID .skipSettingMaxMenuItemID dec de ld h,d @@ -16046,8 +16046,8 @@ HandleItemListSwapping: ; 6b44 (1:6b44) jr .moveItemsUpLoop .afterMovingItemsUp xor a - ld [W_LISTSCROLLOFFSET],a - ld [W_CURMENUITEMID],a + ld [wListScrollOffset],a + ld [wCurrentMenuItem],a .done xor a ld [$cc35],a ; 0 means no item is currently being swapped @@ -16056,15 +16056,15 @@ HandleItemListSwapping: ; 6b44 (1:6b44) jp DisplayListMenuIDLoop DisplayPokemartDialogue_: ; 6c20 (1:6c20) - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] ld [$d07e],a call UpdateSprites ; move sprites xor a ld [$cf0a],a ; flag that is set if something is sold or bought .loop xor a - ld [W_LISTSCROLLOFFSET],a - ld [W_CURMENUITEMID],a + ld [wListScrollOffset],a + ld [wCurrentMenuItem],a ld [$cc2f],a inc a ld [$cf93],a @@ -16096,7 +16096,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld hl, Func_39bd5 ld b, BANK(Func_39bd5) call Bankswitch - ld a,[W_NUMBAGITEMS] + ld a,[wNumBagItems] and a jp z,.bagEmpty ld hl,PokemonSellingGreetingText @@ -16107,16 +16107,16 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld a,$13 ld [$d125],a call DisplayTextBoxID ; draw money text box - ld hl,W_NUMBAGITEMS + ld hl,wNumBagItems ld a,l ld [$cf8b],a ld a,h ld [$cf8c],a xor a ld [$cf93],a - ld [W_CURMENUITEMID],a + ld [wCurrentMenuItem],a ld a,ITEMLISTMENU - ld [W_LISTMENUID],a + ld [wListMenuID],a call DisplayListMenuID jp c,.returnToMainPokemartMenu ; if the player closed the menu .confirmItemSale ; if the player is trying to sell a specific item @@ -16128,7 +16128,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) call IsItemHM jr c,.unsellableItem ld a,PRICEDITEMLISTMENU - ld [W_LISTMENUID],a + ld [wListMenuID],a ld [$ff8e],a ; halve prices when selling call DisplayChooseQuantityMenu inc a @@ -16156,7 +16156,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld [$cf0a],a .skipSettingFlag1 call AddAmountSoldToMoney - ld hl,W_NUMBAGITEMS + ld hl,wNumBagItems call RemoveItemFromInventory jp .sellMenuLoop .unsellableItem @@ -16190,11 +16190,11 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld a,h ld [$cf8c],a xor a - ld [W_CURMENUITEMID],a + ld [wCurrentMenuItem],a inc a ld [$cf93],a inc a ; a = 2 (PRICEDITEMLISTMENU) - ld [W_LISTMENUID],a + ld [wListMenuID],a call DisplayListMenuID jr c,.returnToMainPokemartMenu ; if the player closed the menu ld a,$63 @@ -16225,7 +16225,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) .buyItem call .isThereEnoughMoney jr c,.notEnoughMoney - ld hl,W_NUMBAGITEMS + ld hl,wNumBagItems call AddItemToInventory jr nc,.bagFull call SubtractAmountPaidFromMoney @@ -16250,7 +16250,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) call PrintText jp .loop .isThereEnoughMoney - ld de,W_PLAYERMONEY3 + ld de,wPlayerMoney ld hl,$ff9f ; item price ld c,3 ; length of money in bytes jp StringCmp @@ -16269,7 +16269,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld [$cfcb],a call UpdateSprites ; move sprites ld a,[$d07e] - ld [W_LISTSCROLLOFFSET],a + ld [wListScrollOffset],a ret PokemartBuyingGreetingText: ; 6e0c (1:6e0c) @@ -16318,7 +16318,7 @@ PokemartAnythingElseText: ; 6e3e (1:6e3e) Func_6e43: ; 6e43 (1:6e43) call SaveScreenTilesToBuffer1 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1NAME ; $d2b5 call GetPartyMonName ld hl, $cd6d @@ -16329,7 +16329,7 @@ Func_6e43: ; 6e43 (1:6e43) Func_6e5b: ; 6e5b (1:6e5b) ld hl, W_PARTYMON1_MOVE1 ; $d173 ld bc, $2c - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call AddNTimes ld d, h ld e, l @@ -16374,9 +16374,9 @@ Func_6e5b: ; 6e5b (1:6e5b) ld a, [W_ISINBATTLE] ; $d057 and a jp z, Func_6efe - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld b, a - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f cp b jp nz, Func_6efe ld h, d @@ -16400,7 +16400,7 @@ Func_6eda: ; 6eda (1:6eda) ld a, $14 ld [$d125], a call DisplayTextBoxID - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jp nz, Func_6e5b ld hl, UnnamedText_6fbe ; $6fbe @@ -16425,7 +16425,7 @@ Func_6f07: ; 6f07 (1:6f07) ld [$d125], a call DisplayTextBoxID pop hl - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 rra ret c ld bc, $fffc @@ -16457,7 +16457,7 @@ Func_6f07: ; 6f07 (1:6f07) ld a, [$FF00+$f6] res 2, a ld [$FF00+$f6], a - ld hl, W_TOPMENUITEMY ; $cc24 + ld hl, wTopMenuItemY ; $cc24 ld a, $8 ld [hli], a ld a, $5 @@ -16482,7 +16482,7 @@ Func_6f07: ; 6f07 (1:6f07) bit 1, a jr nz, .asm_6fab push hl - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld c, a ld b, $0 add hl, bc @@ -16560,7 +16560,7 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) call PrintText .skipShallWeHealYourPokemon call YesNoChoicePokeCenter ; yes/no menu - ld a, [W_CURMENUITEMID] + ld a, [wCurrentMenuItem] and a jr nz, .declinedHealing ; if the player chose No call Unknown_7078 @@ -16575,7 +16575,7 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) ld hl, Func_70433 call Bankswitch ; do the healing machine animation xor a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld a, [$c0f0] ld [$c0ef], a ld a, [$d35b] @@ -16681,7 +16681,7 @@ DisplayTextIDInit: ; 7096 (1:7096) .skipDrawingTextBoxBorder ld hl,$cfc4 set 0,[hl] - ld hl,W_FLAGS_CD60 + ld hl,wFlags_0xcd60 bit 4,[hl] res 4,[hl] jr nz,.skipMovingSprites @@ -17095,7 +17095,7 @@ GetTextBoxIDText: ; 7367 (1:7367) ; hl = address of upper left corner of text box GetAddressOfScreenCoords: ; 7375 (1:7375) push bc - ld hl,W_SCREENTILESBUFFER + ld hl,wTileMap ld bc,20 .loop ; loop to add d rows to the base address ld a,d @@ -17268,7 +17268,7 @@ JapanesePokedexMenu: ; 74a1 (1:74a1) call ClearScreenArea FuncCoord 12, 1 ; $c3c0 ld hl, Coord - ld de, W_PLAYERMONEY3 ; $d347 + ld de, wPlayerMoney ; $d347 ld c, $a3 call PrintBCDNumber ld hl, $d730 @@ -17288,16 +17288,16 @@ Function_74ea: ; 0x74ea, 1:34ea ld [$d125], a call DisplayTextBoxID ld a, $3 - ld [W_MENUWATCHEDKEYS], a ; $cc29 + ld [wMenuWatchedKeys], a ; $cc29 ld a, $2 - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 ld a, $1 - ld [W_TOPMENUITEMY], a ; $cc24 + ld [wTopMenuItemY], a ; $cc24 ld a, $1 - ld [W_TOPMENUITEMX], a ; $cc25 + ld [wTopMenuItemX], a ; $cc25 xor a - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_OLDMENUITEMID], a ; $cc2a + ld [wCurrentMenuItem], a ; $cc26 + ld [wLastMenuItem], a ; $cc2a ld [$cc37], a ld a, [$d730] res 6, a @@ -17314,17 +17314,17 @@ Function_74ea: ; 0x74ea, 1:34ea .asm_7539 ld a, $1 ld [$d12e], a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld [$d12d], a ld b, a - ld a, [W_MAXMENUITEMID] ; $cc28 + ld a, [wMaxMenuItem] ; $cc28 cp b jr z, .asm_754c ret .asm_754c ld a, $2 ld [$d12e], a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld [$d12d], a scf ret @@ -17338,15 +17338,15 @@ DisplayYesNoTextBox: ; 7559 (1:7559) ld [$d12d], a ld [$d12e], a ld a, $3 - ld [W_MENUWATCHEDKEYS], a ; $cc29 + ld [wMenuWatchedKeys], a ; $cc29 ld a, $1 - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 ld a, b - ld [W_TOPMENUITEMY], a ; $cc24 + ld [wTopMenuItemY], a ; $cc24 ld a, c - ld [W_TOPMENUITEMX], a ; $cc25 + ld [wTopMenuItemX], a ; $cc25 xor a - ld [W_OLDMENUITEMID], a ; $cc2a + ld [wLastMenuItem], a ; $cc2a ld [$cc37], a push hl ld hl, $d12c @@ -17355,7 +17355,7 @@ DisplayYesNoTextBox: ; 7559 (1:7559) jr z, .asm_758d inc a .asm_758d - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 pop hl push hl push hl @@ -17407,10 +17407,10 @@ DisplayYesNoTextBox: ; 7559 (1:7559) jr nz, .asm_7603 xor a ld [$d12c], a - ld a, [W_FLAGS_CD60] + ld a, [wFlags_0xcd60] push af push hl - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 bit 5, [hl] set 5, [hl] pop hl @@ -17420,7 +17420,7 @@ DisplayYesNoTextBox: ; 7559 (1:7559) jr nz, .asm_75f0 pop af pop hl - ld [W_FLAGS_CD60], a + ld [wFlags_0xcd60], a ld a, $90 call PlaySound jr .asm_760f @@ -17432,7 +17432,7 @@ DisplayYesNoTextBox: ; 7559 (1:7559) bit 1, a jr nz, .asm_7627 .asm_760f - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld [$d12d], a and a jr nz, .asm_7627 @@ -17445,7 +17445,7 @@ DisplayYesNoTextBox: ; 7559 (1:7559) ret .asm_7627 ld a, $1 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld [$d12d], a ld a, $2 ld [$d12e], a @@ -17527,7 +17527,7 @@ MenuStrings: ; 7671 (1:7671) Function_76e1: ; 0x76e1, 1:36e1 xor a - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d ld [hli], a ld [hli], a ld [hli], a @@ -17591,7 +17591,7 @@ Function_76e1: ; 0x76e1, 1:36e1 jr nz, .asm_7747 xor a ld [$cd41], a - ld de, W_WHICHTRADE ; $cd3d + ld de, wWhichTrade ; $cd3d .asm_7752 push hl ld hl, FieldMoveNames ; $778d @@ -17651,14 +17651,14 @@ PokemonMenuEntries: ; 77c2 (1:77c2) db "CANCEL@" Func_77d6: ; 77d6 (1:77d6) - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1_MOVE1 ; $d173 ld bc, $2c call AddNTimes ld d, h ld e, l ld c, $5 - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d .asm_77e9 push hl .asm_77ea @@ -17727,7 +17727,7 @@ Func_783f: ; 783f (1:783f) ld de, W_ENEMYMONMAXHP ; $cff4 Func_7861: ; 7861 (1:7861) - ld bc, W_HPBAROLDHP+1 + ld bc, wHPBarOldHP+1 ld a, [hli] ld [bc], a ld a, [hl] @@ -17744,12 +17744,12 @@ Func_7861: ; 7861 (1:7861) ld b, [hl] add b ld [hld], a - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a ld a, [W_DAMAGE] ; $d0d7 ld b, [hl] adc b ld [hli], a - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP+1], a jr c, .asm_7890 ld a, [hld] ld b, a @@ -17765,11 +17765,11 @@ Func_7861: ; 7861 (1:7861) .asm_7890 ld a, [de] ld [hld], a - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a dec de ld a, [de] ld [hli], a - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP+1], a inc de .asm_789c ld a, [H_WHOSETURN] ; $FF00+$f3 @@ -17782,7 +17782,7 @@ Func_7861: ; 7861 (1:7861) ld hl, Coord xor a .asm_78aa - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 ld a, $48 call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) ld a, $0 @@ -17822,7 +17822,7 @@ Func_78e6: ; 78e6 (1:78e6) xor a ld [$cc2c], a ld [$ccd3], a - ld a, [W_FLAGS_CD60] + ld a, [wFlags_0xcd60] bit 3, a jr nz, Func_790c ld a, $99 @@ -17832,11 +17832,11 @@ Func_78e6: ; 78e6 (1:78e6) Func_790c: ; 790c (1:790c) ld a, [$ccd3] - ld [W_CURMENUITEMID], a ; $cc26 - ld hl, W_FLAGS_CD60 + ld [wCurrentMenuItem], a ; $cc26 + ld hl, wFlags_0xcd60 set 5, [hl] call LoadScreenTilesFromBuffer2 - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $8 ld c, $e call TextBoxBorder @@ -17845,7 +17845,7 @@ Func_790c: ; 790c (1:790c) ld hl, Coord ld de, PlayersPCMenuEntries ; $7af5 call PlaceString - ld hl, W_TOPMENUITEMY ; $cc24 + ld hl, wTopMenuItemY ; $cc24 ld a, $2 ld [hli], a dec a @@ -17858,17 +17858,17 @@ Func_790c: ; 790c (1:790c) ld [hli], a xor a ld [hl], a - ld hl, W_LISTSCROLLOFFSET ; $cc36 + ld hl, wListScrollOffset ; $cc36 ld [hli], a ld [hl], a - ld [W_PLAYERMONNUMBER], a ; $cc2f + ld [wPlayerMonNumber], a ; $cc2f ld hl, UnnamedText_7b27 ; $7b27 call PrintText call HandleMenuInput bit 1, a jp nz, Func_796d call PlaceUnfilledArrowMenuCursor - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld [$ccd3], a and a jp z, Func_7a12 @@ -17878,18 +17878,18 @@ Func_790c: ; 790c (1:790c) jp z, Func_7a8f Func_796d: ; 796d (1:796d) - ld a, [W_FLAGS_CD60] + ld a, [wFlags_0xcd60] bit 3, a jr nz, .asm_797c ld a, $9a call PlaySound call WaitForSoundToFinish .asm_797c - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 res 5, [hl] call LoadScreenTilesFromBuffer2 xor a - ld [W_LISTSCROLLOFFSET], a ; $cc36 + ld [wListScrollOffset], a ; $cc36 ld [$cc2c], a ld hl, $d730 res 6, [hl] @@ -17899,9 +17899,9 @@ Func_796d: ; 796d (1:796d) Func_7995: ; 7995 (1:7995) xor a - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_LISTSCROLLOFFSET], a ; $cc36 - ld a, [W_NUMBAGITEMS] ; $d31d + ld [wCurrentMenuItem], a ; $cc26 + ld [wListScrollOffset], a ; $cc36 + ld a, [wNumBagItems] ; $d31d and a jr nz, Func_79ab ld hl, UnnamedText_7b3b ; $7b3b @@ -17911,7 +17911,7 @@ Func_7995: ; 7995 (1:7995) Func_79ab: ; 79ab (1:79ab) ld hl, UnnamedText_7b2c ; $7b2c call PrintText - ld hl, W_NUMBAGITEMS ; $d31d + ld hl, wNumBagItems ; $d31d ld a, l ld [$cf8b], a ld a, h @@ -17919,7 +17919,7 @@ Func_79ab: ; 79ab (1:79ab) xor a ld [$cf93], a ld a, $3 - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 call DisplayListMenuID jp c, Func_790c call IsKeyItem @@ -17934,14 +17934,14 @@ Func_79ab: ; 79ab (1:79ab) cp $ff jp z, Func_79ab .asm_79e7 - ld hl, W_NUMBOXITEMS ; $d53a + ld hl, wNumBoxItems ; $d53a call AddItemToInventory jr c, .asm_79f8 ld hl, UnnamedText_7b40 ; $7b40 call PrintText jp Func_79ab .asm_79f8 - ld hl, W_NUMBAGITEMS ; $d31d + ld hl, wNumBagItems ; $d31d call RemoveItemFromInventory call WaitForSoundToFinish ld a, $ab @@ -17953,9 +17953,9 @@ Func_79ab: ; 79ab (1:79ab) Func_7a12: ; 7a12 (1:7a12) xor a - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_LISTSCROLLOFFSET], a ; $cc36 - ld a, [W_NUMBOXITEMS] ; $d53a + ld [wCurrentMenuItem], a ; $cc26 + ld [wListScrollOffset], a ; $cc36 + ld a, [wNumBoxItems] ; $d53a and a jr nz, Func_7a28 ld hl, UnnamedText_7b54 ; $7b54 @@ -17965,7 +17965,7 @@ Func_7a12: ; 7a12 (1:7a12) Func_7a28: ; 7a28 (1:7a28) ld hl, UnnamedText_7b45 ; $7b45 call PrintText - ld hl, W_NUMBOXITEMS ; $d53a + ld hl, wNumBoxItems ; $d53a ld a, l ld [$cf8b], a ld a, h @@ -17973,7 +17973,7 @@ Func_7a28: ; 7a28 (1:7a28) xor a ld [$cf93], a ld a, $3 - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 call DisplayListMenuID jp c, Func_790c call IsKeyItem @@ -17988,14 +17988,14 @@ Func_7a28: ; 7a28 (1:7a28) cp $ff jp z, Func_7a28 .asm_7a64 - ld hl, W_NUMBAGITEMS ; $d31d + ld hl, wNumBagItems ; $d31d call AddItemToInventory jr c, .asm_7a75 ld hl, UnnamedText_7b59 ; $7b59 call PrintText jp Func_7a28 .asm_7a75 - ld hl, W_NUMBOXITEMS ; $d53a + ld hl, wNumBoxItems ; $d53a call RemoveItemFromInventory call WaitForSoundToFinish ld a, $ab @@ -18007,9 +18007,9 @@ Func_7a28: ; 7a28 (1:7a28) Func_7a8f: ; 7a8f (1:7a8f) xor a - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_LISTSCROLLOFFSET], a ; $cc36 - ld a, [W_NUMBOXITEMS] ; $d53a + ld [wCurrentMenuItem], a ; $cc26 + ld [wListScrollOffset], a ; $cc36 + ld a, [wNumBoxItems] ; $d53a and a jr nz, Func_7aa5 ld hl, UnnamedText_7b54 ; $7b54 @@ -18019,7 +18019,7 @@ Func_7a8f: ; 7a8f (1:7a8f) Func_7aa5: ; 7aa5 (1:7aa5) ld hl, UnnamedText_7b5e ; $7b5e call PrintText - ld hl, W_NUMBOXITEMS ; $d53a + ld hl, wNumBoxItems ; $d53a ld a, l ld [$cf8b], a ld a, h @@ -18027,7 +18027,7 @@ Func_7aa5: ; 7aa5 (1:7aa5) xor a ld [$cf93], a ld a, $3 - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 push hl call DisplayListMenuID pop hl @@ -18126,7 +18126,7 @@ _RemovePokemon: ; 7b68 (1:7b68) ld a, [hl] dec a ld [hli], a - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld c, a ld b, $0 add hl, bc @@ -18147,9 +18147,9 @@ _RemovePokemon: ; 7b68 (1:7b68) ld hl, $dd2a ld d, $13 .asm_7b97 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call SkipFixedLengthTextEntries - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 cp d jr nz, .asm_7ba6 ld [hl], $ff @@ -18174,7 +18174,7 @@ _RemovePokemon: ; 7b68 (1:7b68) ld hl, W_BOXMON1DATA ld bc, $21 .asm_7bcd - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call AddNTimes ld d, h ld e, l @@ -18198,13 +18198,13 @@ _RemovePokemon: ; 7b68 (1:7b68) ld hl, $de06 .asm_7bfa ld bc, $b - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call AddNTimes ld d, h ld e, l ld bc, $b add hl, bc - ld bc, W_OWNEDPOKEMON ; $d2f7 + ld bc, wPokedexOwned ; $d2f7 ld a, [$cf95] and a jr z, .asm_7c15 @@ -18237,28 +18237,28 @@ Func_7c18: ; 7c18 (1:7c18) SECTION "bank2",ROMX,BANK[$2] -INCLUDE "music/headers/sfxheaders02.tx" -INCLUDE "music/headers/musicheaders02.tx" - -INCLUDE "music/sfx/sfx_02_01.tx" -INCLUDE "music/sfx/sfx_02_02.tx" -INCLUDE "music/sfx/sfx_02_03.tx" -INCLUDE "music/sfx/sfx_02_04.tx" -INCLUDE "music/sfx/sfx_02_05.tx" -INCLUDE "music/sfx/sfx_02_06.tx" -INCLUDE "music/sfx/sfx_02_07.tx" -INCLUDE "music/sfx/sfx_02_08.tx" -INCLUDE "music/sfx/sfx_02_09.tx" -INCLUDE "music/sfx/sfx_02_0a.tx" -INCLUDE "music/sfx/sfx_02_0b.tx" -INCLUDE "music/sfx/sfx_02_0c.tx" -INCLUDE "music/sfx/sfx_02_0d.tx" -INCLUDE "music/sfx/sfx_02_0e.tx" -INCLUDE "music/sfx/sfx_02_0f.tx" -INCLUDE "music/sfx/sfx_02_10.tx" -INCLUDE "music/sfx/sfx_02_11.tx" -INCLUDE "music/sfx/sfx_02_12.tx" -INCLUDE "music/sfx/sfx_02_13.tx" +INCLUDE "music/headers/sfxheaders02.asm" +INCLUDE "music/headers/musicheaders02.asm" + +INCLUDE "music/sfx/sfx_02_01.asm" +INCLUDE "music/sfx/sfx_02_02.asm" +INCLUDE "music/sfx/sfx_02_03.asm" +INCLUDE "music/sfx/sfx_02_04.asm" +INCLUDE "music/sfx/sfx_02_05.asm" +INCLUDE "music/sfx/sfx_02_06.asm" +INCLUDE "music/sfx/sfx_02_07.asm" +INCLUDE "music/sfx/sfx_02_08.asm" +INCLUDE "music/sfx/sfx_02_09.asm" +INCLUDE "music/sfx/sfx_02_0a.asm" +INCLUDE "music/sfx/sfx_02_0b.asm" +INCLUDE "music/sfx/sfx_02_0c.asm" +INCLUDE "music/sfx/sfx_02_0d.asm" +INCLUDE "music/sfx/sfx_02_0e.asm" +INCLUDE "music/sfx/sfx_02_0f.asm" +INCLUDE "music/sfx/sfx_02_10.asm" +INCLUDE "music/sfx/sfx_02_11.asm" +INCLUDE "music/sfx/sfx_02_12.asm" +INCLUDE "music/sfx/sfx_02_13.asm" Music2_Channel3DutyPointers: ; 0x8361 dw Music2_Channel3Duty1 @@ -18286,83 +18286,83 @@ Music2_Channel3Duty4: ; 0x83a3 Music2_Channel3Duty5: ; 0x83b3 db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 -INCLUDE "music/sfx/sfx_02_3f.tx" -INCLUDE "music/sfx/sfx_02_5e.tx" -INCLUDE "music/sfx/sfx_02_56.tx" -INCLUDE "music/sfx/sfx_02_57.tx" -INCLUDE "music/sfx/sfx_02_58.tx" -INCLUDE "music/sfx/sfx_02_3c.tx" -INCLUDE "music/sfx/sfx_02_59.tx" -INCLUDE "music/sfx/sfx_02_5a.tx" -INCLUDE "music/sfx/sfx_02_5b.tx" -INCLUDE "music/sfx/sfx_02_5c.tx" -INCLUDE "music/sfx/sfx_02_40.tx" -INCLUDE "music/sfx/sfx_02_5d.tx" -INCLUDE "music/sfx/sfx_02_3d.tx" -INCLUDE "music/sfx/sfx_02_43.tx" -INCLUDE "music/sfx/sfx_02_3e.tx" -INCLUDE "music/sfx/sfx_02_44.tx" -INCLUDE "music/sfx/sfx_02_45.tx" -INCLUDE "music/sfx/sfx_02_46.tx" -INCLUDE "music/sfx/sfx_02_47.tx" -INCLUDE "music/sfx/sfx_02_48.tx" -INCLUDE "music/sfx/sfx_02_49.tx" -INCLUDE "music/sfx/sfx_02_4a.tx" -INCLUDE "music/sfx/sfx_02_4b.tx" -INCLUDE "music/sfx/sfx_02_4c.tx" -INCLUDE "music/sfx/sfx_02_4d.tx" -INCLUDE "music/sfx/sfx_02_4e.tx" -INCLUDE "music/sfx/sfx_02_4f.tx" -INCLUDE "music/sfx/sfx_02_50.tx" -INCLUDE "music/sfx/sfx_02_51.tx" -INCLUDE "music/sfx/sfx_02_52.tx" -INCLUDE "music/sfx/sfx_02_53.tx" -INCLUDE "music/sfx/sfx_02_54.tx" -INCLUDE "music/sfx/sfx_02_55.tx" -INCLUDE "music/sfx/sfx_02_5f.tx" -INCLUDE "music/sfx/sfx_02_unused.tx" -INCLUDE "music/sfx/sfx_02_1d.tx" -INCLUDE "music/sfx/sfx_02_37.tx" -INCLUDE "music/sfx/sfx_02_38.tx" -INCLUDE "music/sfx/sfx_02_25.tx" -INCLUDE "music/sfx/sfx_02_39.tx" -INCLUDE "music/sfx/sfx_02_17.tx" -INCLUDE "music/sfx/sfx_02_23.tx" -INCLUDE "music/sfx/sfx_02_24.tx" -INCLUDE "music/sfx/sfx_02_14.tx" -INCLUDE "music/sfx/sfx_02_22.tx" -INCLUDE "music/sfx/sfx_02_1a.tx" -INCLUDE "music/sfx/sfx_02_1b.tx" -INCLUDE "music/sfx/sfx_02_19.tx" -INCLUDE "music/sfx/sfx_02_1f.tx" -INCLUDE "music/sfx/sfx_02_20.tx" -INCLUDE "music/sfx/sfx_02_16.tx" -INCLUDE "music/sfx/sfx_02_21.tx" -INCLUDE "music/sfx/sfx_02_15.tx" -INCLUDE "music/sfx/sfx_02_1e.tx" -INCLUDE "music/sfx/sfx_02_1c.tx" -INCLUDE "music/sfx/sfx_02_18.tx" -INCLUDE "music/sfx/sfx_02_2d.tx" -INCLUDE "music/sfx/sfx_02_2a.tx" -INCLUDE "music/sfx/sfx_02_2f.tx" -INCLUDE "music/sfx/sfx_02_26.tx" -INCLUDE "music/sfx/sfx_02_27.tx" -INCLUDE "music/sfx/sfx_02_28.tx" -INCLUDE "music/sfx/sfx_02_32.tx" -INCLUDE "music/sfx/sfx_02_29.tx" -INCLUDE "music/sfx/sfx_02_2b.tx" -INCLUDE "music/sfx/sfx_02_30.tx" -INCLUDE "music/sfx/sfx_02_2e.tx" -INCLUDE "music/sfx/sfx_02_31.tx" -INCLUDE "music/sfx/sfx_02_2c.tx" -INCLUDE "music/sfx/sfx_02_33.tx" -INCLUDE "music/sfx/sfx_02_34.tx" -INCLUDE "music/sfx/sfx_02_35.tx" -INCLUDE "music/sfx/sfx_02_36.tx" +INCLUDE "music/sfx/sfx_02_3f.asm" +INCLUDE "music/sfx/sfx_02_5e.asm" +INCLUDE "music/sfx/sfx_02_56.asm" +INCLUDE "music/sfx/sfx_02_57.asm" +INCLUDE "music/sfx/sfx_02_58.asm" +INCLUDE "music/sfx/sfx_02_3c.asm" +INCLUDE "music/sfx/sfx_02_59.asm" +INCLUDE "music/sfx/sfx_02_5a.asm" +INCLUDE "music/sfx/sfx_02_5b.asm" +INCLUDE "music/sfx/sfx_02_5c.asm" +INCLUDE "music/sfx/sfx_02_40.asm" +INCLUDE "music/sfx/sfx_02_5d.asm" +INCLUDE "music/sfx/sfx_02_3d.asm" +INCLUDE "music/sfx/sfx_02_43.asm" +INCLUDE "music/sfx/sfx_02_3e.asm" +INCLUDE "music/sfx/sfx_02_44.asm" +INCLUDE "music/sfx/sfx_02_45.asm" +INCLUDE "music/sfx/sfx_02_46.asm" +INCLUDE "music/sfx/sfx_02_47.asm" +INCLUDE "music/sfx/sfx_02_48.asm" +INCLUDE "music/sfx/sfx_02_49.asm" +INCLUDE "music/sfx/sfx_02_4a.asm" +INCLUDE "music/sfx/sfx_02_4b.asm" +INCLUDE "music/sfx/sfx_02_4c.asm" +INCLUDE "music/sfx/sfx_02_4d.asm" +INCLUDE "music/sfx/sfx_02_4e.asm" +INCLUDE "music/sfx/sfx_02_4f.asm" +INCLUDE "music/sfx/sfx_02_50.asm" +INCLUDE "music/sfx/sfx_02_51.asm" +INCLUDE "music/sfx/sfx_02_52.asm" +INCLUDE "music/sfx/sfx_02_53.asm" +INCLUDE "music/sfx/sfx_02_54.asm" +INCLUDE "music/sfx/sfx_02_55.asm" +INCLUDE "music/sfx/sfx_02_5f.asm" +INCLUDE "music/sfx/sfx_02_unused.asm" +INCLUDE "music/sfx/sfx_02_1d.asm" +INCLUDE "music/sfx/sfx_02_37.asm" +INCLUDE "music/sfx/sfx_02_38.asm" +INCLUDE "music/sfx/sfx_02_25.asm" +INCLUDE "music/sfx/sfx_02_39.asm" +INCLUDE "music/sfx/sfx_02_17.asm" +INCLUDE "music/sfx/sfx_02_23.asm" +INCLUDE "music/sfx/sfx_02_24.asm" +INCLUDE "music/sfx/sfx_02_14.asm" +INCLUDE "music/sfx/sfx_02_22.asm" +INCLUDE "music/sfx/sfx_02_1a.asm" +INCLUDE "music/sfx/sfx_02_1b.asm" +INCLUDE "music/sfx/sfx_02_19.asm" +INCLUDE "music/sfx/sfx_02_1f.asm" +INCLUDE "music/sfx/sfx_02_20.asm" +INCLUDE "music/sfx/sfx_02_16.asm" +INCLUDE "music/sfx/sfx_02_21.asm" +INCLUDE "music/sfx/sfx_02_15.asm" +INCLUDE "music/sfx/sfx_02_1e.asm" +INCLUDE "music/sfx/sfx_02_1c.asm" +INCLUDE "music/sfx/sfx_02_18.asm" +INCLUDE "music/sfx/sfx_02_2d.asm" +INCLUDE "music/sfx/sfx_02_2a.asm" +INCLUDE "music/sfx/sfx_02_2f.asm" +INCLUDE "music/sfx/sfx_02_26.asm" +INCLUDE "music/sfx/sfx_02_27.asm" +INCLUDE "music/sfx/sfx_02_28.asm" +INCLUDE "music/sfx/sfx_02_32.asm" +INCLUDE "music/sfx/sfx_02_29.asm" +INCLUDE "music/sfx/sfx_02_2b.asm" +INCLUDE "music/sfx/sfx_02_30.asm" +INCLUDE "music/sfx/sfx_02_2e.asm" +INCLUDE "music/sfx/sfx_02_31.asm" +INCLUDE "music/sfx/sfx_02_2c.asm" +INCLUDE "music/sfx/sfx_02_33.asm" +INCLUDE "music/sfx/sfx_02_34.asm" +INCLUDE "music/sfx/sfx_02_35.asm" +INCLUDE "music/sfx/sfx_02_36.asm" PlayBattleMusic: ; 0x90c6 xor a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld [$d083], a dec a ld [$c0ee], a @@ -20115,7 +20115,7 @@ Music_Cities1AlternateTempo: ; 0x9b81 ld [$cfc8], a ld [$cfc9], a ld a, $ff - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld c, $64 call DelayFrames ld c, BANK(Music_Cities1) @@ -20125,31 +20125,31 @@ Music_Cities1AlternateTempo: ; 0x9b81 ld de, Music_Cities1_branch_aa6f jp Music2_OverwriteChannelPointer -INCLUDE "music/pkmnhealed.tx" -INCLUDE "music/routes1.tx" -INCLUDE "music/routes2.tx" -INCLUDE "music/routes3.tx" -INCLUDE "music/routes4.tx" -INCLUDE "music/indigoplateau.tx" -INCLUDE "music/pallettown.tx" -INCLUDE "music/unusedsong.tx" -INCLUDE "music/cities1.tx" -INCLUDE "music/sfx/sfx_02_3a.tx" -INCLUDE "music/museumguy.tx" -INCLUDE "music/meetprofoak.tx" -INCLUDE "music/meetrival.tx" -INCLUDE "music/sfx/sfx_02_41.tx" -INCLUDE "music/sfx/sfx_02_3b.tx" -INCLUDE "music/sfx/sfx_02_42.tx" -INCLUDE "music/ssanne.tx" -INCLUDE "music/cities2.tx" -INCLUDE "music/celadon.tx" -INCLUDE "music/cinnabar.tx" -INCLUDE "music/vermilion.tx" -INCLUDE "music/lavender.tx" -INCLUDE "music/safarizone.tx" -INCLUDE "music/gym.tx" -INCLUDE "music/pokecenter.tx" +INCLUDE "music/pkmnhealed.asm" +INCLUDE "music/routes1.asm" +INCLUDE "music/routes2.asm" +INCLUDE "music/routes3.asm" +INCLUDE "music/routes4.asm" +INCLUDE "music/indigoplateau.asm" +INCLUDE "music/pallettown.asm" +INCLUDE "music/unusedsong.asm" +INCLUDE "music/cities1.asm" +INCLUDE "music/sfx/sfx_02_3a.asm" +INCLUDE "music/museumguy.asm" +INCLUDE "music/meetprofoak.asm" +INCLUDE "music/meetrival.asm" +INCLUDE "music/sfx/sfx_02_41.asm" +INCLUDE "music/sfx/sfx_02_3b.asm" +INCLUDE "music/sfx/sfx_02_42.asm" +INCLUDE "music/ssanne.asm" +INCLUDE "music/cities2.asm" +INCLUDE "music/celadon.asm" +INCLUDE "music/cinnabar.asm" +INCLUDE "music/vermilion.asm" +INCLUDE "music/lavender.asm" +INCLUDE "music/safarizone.asm" +INCLUDE "music/gym.asm" +INCLUDE "music/pokecenter.asm" SECTION "bank3",ROMX,BANK[$3] @@ -20174,7 +20174,7 @@ _GetJoypadState: ; c000 (3:4000) jr nz, DiscardButtonPresses ld a, [H_OLDPRESSEDBUTTONS] ld [H_CURRENTPRESSEDBUTTONS], a - ld a, [W_JOYPADFORBIDDENBUTTONSMASK] + ld a, [wJoypadForbiddenButtonsMask] and a ret z cpl @@ -20969,7 +20969,7 @@ Func_c335: ; c335 (3:4335) ld hl, $d73f ld [hli], a ld [hl], a - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d ld bc, $1e call FillMemory ret @@ -21204,13 +21204,13 @@ Func_c52f: ; c52f (3:452f) ret c cp $e2 ret nc - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $3 ld c, $7 call TextBoxBorder FuncCoord 1, 1 ; $c3b5 ld hl, Coord - ld de, W_SAFARITIMER1 ; $d70d + ld de, wSafariSteps ; $d70d ld bc, $203 call PrintNumber FuncCoord 4, 1 ; $c3b8 @@ -21440,7 +21440,7 @@ Func_c69c: ; c69c (3:469c) ld a, [$d13b] and $3 jp nz, .asm_c74f - ld [W_WHICHPOKEMON], a ; $cf92 + ld [wWhichPokemon], a ; $cf92 ld hl, W_PARTYMON1_STATUS ; $d16f ld de, W_PARTYMON1 ; $d164 .asm_c6be @@ -21473,11 +21473,11 @@ Func_c69c: ; c69c (3:469c) ld a, [de] ld [$d11e], a push de - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1NAME ; $d2b5 call GetPartyMonName xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call EnableAutoTextBoxDrawing ld a, $d0 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c @@ -21495,7 +21495,7 @@ Func_c69c: ; c69c (3:469c) ld bc, $2c add hl, bc push hl - ld hl, W_WHICHPOKEMON ; $cf92 + ld hl, wWhichPokemon ; $cf92 inc [hl] pop hl jr .asm_c6be @@ -22282,7 +22282,7 @@ UnnamedText_cdff: ; cdff (3:4dff) ; function to add an item (in varying quantities) to the player's bag or PC box ; INPUT: -; hl = address of inventory (either W_NUMBAGITEMS or W_NUMBOXITEMS) +; hl = address of inventory (either wNumBagItems or wNumBoxItems) ; [$CF91] = item ID ; [$CF96] = item quantity ; sets carry flag if successful, unsets carry flag if unsuccessful @@ -22294,10 +22294,10 @@ AddItemToInventory_: ; ce04 (3:4e04) push hl push hl ld d,50 ; PC box can hold 50 items - ld a,W_NUMBAGITEMS & $FF + ld a,wNumBagItems & $FF cp l jr nz,.checkIfInventoryFull - ld a,W_NUMBAGITEMS >> 8 + ld a,wNumBagItems >> 8 cp h jr nz,.checkIfInventoryFull ; if the destination is the bag @@ -22376,7 +22376,7 @@ AddItemToInventory_: ; ce04 (3:4e04) ; function to remove an item (in varying quantities) from the player's bag or PC box ; INPUT: -; hl = address of inventory (either W_NUMBAGITEMS or W_NUMBOXITEMS) +; hl = address of inventory (either wNumBagItems or wNumBoxItems) ; [$CF92] = index (within the inventory) of the item to remove ; [$CF96] = quantity to remove RemoveItemFromInventory_: ; ce74 (3:4e74) @@ -22413,8 +22413,8 @@ RemoveItemFromInventory_: ; ce74 (3:4e74) jr nz,.loop ; update menu info xor a - ld [W_LISTSCROLLOFFSET],a - ld [W_CURMENUITEMID],a + ld [wListScrollOffset],a + ld [wCurrentMenuItem],a ld [$cc2c],a ld [$d07e],a pop hl @@ -22424,7 +22424,7 @@ RemoveItemFromInventory_: ; ce74 (3:4e74) ld [$d12a],a cp a,2 jr c,.done - ld [W_MAXMENUITEMID],a + ld [wMaxMenuItem],a jr .done .skipMovingUpSlots pop hl @@ -26875,7 +26875,7 @@ ItemUseSurfboard: ; d9b4 (3:59b4) xor a ld [$d700],a ; change player state to walking dec a - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a call Func_2307 ; play walking music jp LoadWalkingPlayerSpriteGraphics ; uses a simulated button press to make the player move forward @@ -26943,7 +26943,7 @@ ItemUseEvoStone: ; da5b (3:5a5b) jr z,.noEffect pop af ld [$cf92],a - ld hl,W_NUMBAGITEMS + ld hl,wNumBagItems ld a,1 ; remove 1 stone ld [$cf96],a jp RemoveItemFromInventory @@ -27051,7 +27051,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [hl],a ; remove the status ailment in the party data ld a,b ld [$d07d],a ; the message to display for the item used - ld a,[W_PLAYERMONNUMBER] + ld a,[wPlayerMonNumber] cp d ; is pokemon the item was used on active in battle? jp nz,.doneHealing ; if it is active in battle @@ -27073,10 +27073,10 @@ ItemUseMedicine: ; dabb (3:5abb) inc hl ; hl = address of current HP ld a,[hli] ld b,a - ld [W_HPBAROLDHP+1],a + ld [wHPBarOldHP+1],a ld a,[hl] ld c,a - ld [W_HPBAROLDHP],a ; current HP stored at $ceeb (2 bytes, big-endian) + ld [wHPBarOldHP],a ; current HP stored at $ceeb (2 bytes, big-endian) or b jr nz,.notFainted .fainted @@ -27157,14 +27157,14 @@ ItemUseMedicine: ; dabb (3:5abb) ld bc,32 add hl,bc ; hl now points to max HP ld a,[hli] - ld [W_HPBARMAXHP+1],a + ld [wHPBarMaxHP+1],a ld a,[hl] - ld [W_HPBARMAXHP],a ; max HP stored at $cee9 (2 bytes, big-endian) + ld [wHPBarMaxHP],a ; max HP stored at $cee9 (2 bytes, big-endian) ld a,[$d152] and a ; using Softboiled? jp z,.notUsingSoftboiled2 ; if using softboiled - ld hl,W_HPBARMAXHP + ld hl,wHPBarMaxHP ld a,[hli] push af ld a,[hli] @@ -27181,7 +27181,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [$ceea],a ld [H_DIVIDEND],a ld a,[hl] - ld [W_HPBARMAXHP],a + ld [wHPBarMaxHP],a ld [H_DIVIDEND + 1],a ld a,5 ld [H_DIVISOR],a @@ -27194,17 +27194,17 @@ ItemUseMedicine: ; dabb (3:5abb) push af ld b,a ld a,[hl] - ld [W_HPBAROLDHP],a + ld [wHPBarOldHP],a sub b ld [hld],a - ld [W_HPBARNEWHP],a + ld [wHPBarNewHP],a ld a,[H_QUOTIENT + 2] ld b,a ld a,[hl] - ld [W_HPBAROLDHP+1],a + ld [wHPBarOldHP+1],a sbc b ld [hl],a - ld [W_HPBARNEWHP+1],a + ld [wHPBarNewHP+1],a FuncCoord 4, 1 ; $c3b8 ld hl,Coord ld a,[$cf92] @@ -27256,9 +27256,9 @@ ItemUseMedicine: ; dabb (3:5abb) ld a,[hl] add b ld [hld],a - ld [W_HPBARNEWHP],a + ld [wHPBarNewHP],a ld a,[hl] - ld [W_HPBARNEWHP+1],a + ld [wHPBarNewHP+1],a jr nc,.noCarry inc [hl] ld a,[hl] @@ -27294,22 +27294,22 @@ ItemUseMedicine: ; dabb (3:5abb) ld a,[hli] srl a ld [de],a - ld [W_HPBARNEWHP+1],a + ld [wHPBarNewHP+1],a ld a,[hl] rr a inc de ld [de],a - ld [W_HPBARNEWHP],a + ld [wHPBarNewHP],a dec de jr .doneHealingPartyHP .setCurrentHPToMaxHp ld a,[hli] ld [de],a - ld [W_HPBARNEWHP+1],a + ld [wHPBarNewHP+1],a inc de ld a,[hl] ld [de],a - ld [W_HPBARNEWHP],a + ld [wHPBarNewHP],a dec de .doneHealingPartyHP ; done updating the pokemon's current HP in the party data structure ld a,[$cf91] @@ -27323,7 +27323,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld h,d ld l,e pop de - ld a,[W_PLAYERMONNUMBER] + ld a,[wPlayerMonNumber] cp d ; is pokemon the item was used on active in battle? jr nz,.calculateHPBarCoords ; copy party HP to in-battle HP @@ -28201,7 +28201,7 @@ ItemUsePPRestore: ; e31e (3:631e) cp a,ELIXER jp nc,.useElixir ; if Elixir or Max Elixir ld a,$02 - ld [W_MOVEMENUTYPE],a + ld [wMoveMenuType],a ld hl,RaisePPWhichTechniqueText ld a,[$cd3d] cp a,ETHER ; is it a PP Up? @@ -28256,7 +28256,7 @@ ItemUsePPRestore: ; e31e (3:631e) .afterRestoringPP ; after using a (Max) Ether/Elixir ld a,[$cf92] ld b,a - ld a,[W_PLAYERMONNUMBER] + ld a,[wPlayerMonNumber] cp b ; is the pokemon whose PP was restored active in battle? jr nz,.skipUpdatingInBattleData ld hl,W_PARTYMON1_MOVE1PP @@ -28324,7 +28324,7 @@ ItemUsePPRestore: ; e31e (3:631e) dec [hl] dec [hl] xor a - ld hl,W_CURMENUITEMID + ld hl,wCurrentMenuItem ld [hli],a ld [hl],a ; zero the counter for number of moves that had their PP restored ld b,4 @@ -28343,7 +28343,7 @@ ItemUsePPRestore: ; e31e (3:631e) ld hl,$cc27 ; counter for number of moves that had their PP restored inc [hl] .nextMove - ld hl,W_CURMENUITEMID + ld hl,wCurrentMenuItem inc [hl] pop bc dec b @@ -28417,7 +28417,7 @@ ItemUseTMHM: ; e479 (3:6479) ld a,$14 ld [$d125],a call DisplayTextBoxID ; yes/no menu - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] and a jr z,.useMachine ld a,2 @@ -28512,7 +28512,7 @@ PrintItemUseTextAndRemoveItem: ; e563 (3:6563) call WaitForTextScrollButtonPress ; wait for button press RemoveUsedItem: ; e571 (3:6571) - ld hl,W_NUMBAGITEMS + ld hl,wNumBagItems ld a,1 ; one item ld [$cf96],a ; store quantity jp RemoveItemFromInventory @@ -28616,7 +28616,7 @@ GotOffBicycleText: ; e5fc (3:65fc) ; [$d11e] = mode ; 0: Pokemon Center healing ; 1: using a PP Up -; [CURMENUITEMID] = index of move (when using a PP Up) +; [wCurrentMenuItem] = index of move (when using a PP Up) RestoreBonusPP: ; e606 (3:6606) ld hl,W_PARTYMON1_MOVE1 ld bc,44 @@ -28642,7 +28642,7 @@ RestoreBonusPP: ; e606 (3:6606) dec a ; using a PP Up? jr nz,.skipMenuItemIDCheck ; if using a PP Up, check if this is the move it's being used on - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] inc a cp b jr nz,.nextMove @@ -28708,7 +28708,7 @@ AddBonusPP: ; e642 (3:6642) ; 02: current box ; 03: daycare ; 04: player's in-battle pokemon -; [W_CURMENUITEMID] = move index +; [wCurrentMenuItem] = move index ; OUTPUT: ; [$d11e] = max PP GetMaxPP: ; e677 (3:6677) @@ -28776,7 +28776,7 @@ GetSelectedMoveOffset: ; e6e3 (3:66e3) call AddNTimes GetSelectedMoveOffset2: ; e6e9 (3:66e9) - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld c,a ld b,0 add hl,bc @@ -28784,7 +28784,7 @@ GetSelectedMoveOffset2: ; e6e9 (3:66e9) ; confirms the item toss and then tosses the item ; INPUT: -; hl = address of inventory (either W_NUMBAGITEMS or W_NUMBOXITEMS) +; hl = address of inventory (either wNumBagItems or wNumBoxItems) ; [$cf91] = item ID ; [$cf92] = index of item within inventory ; [$cf96] = quantity to toss @@ -29026,7 +29026,7 @@ Func_e7a4: ; e7a4 (3:67a4) ld de, W_BOXMON1DATA ld bc, $c call CopyData - ld hl, W_PLAYERIDHI ; $d359 + ld hl, wPlayerID ; $d359 ld a, [hli] ld [de], a inc de @@ -29580,7 +29580,7 @@ asm_ef82: ; ef82 (3:6f82) ld [$cd4d], a ld a, $1 ld [$cd6a], a - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1NAME ; $d2b5 call GetPartyMonName ld hl, $d730 @@ -30000,7 +30000,7 @@ Func_f225: ; f225 (3:7225) ld a, [$d728] bit 0, a ret z - ld a, [W_FLAGS_CD60] + ld a, [wFlags_0xcd60] bit 1, a ret nz xor a @@ -30021,7 +30021,7 @@ Func_f225: ; f225 (3:7225) ld a, [hl] cp $10 jp nz, Func_f2dd - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 bit 6, [hl] set 6, [hl] ret z @@ -30064,7 +30064,7 @@ Func_f225: ; f225 (3:7225) call MoveSprite ld a, $a8 call PlaySound - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 set 1, [hl] ret @@ -30088,7 +30088,7 @@ Func_f2b5: ; f2b5 (3:72b5) ld b, BANK(Func_79f54) call Bankswitch ; indirect jump to Func_79f54 (79f54 (1e:5f54)) call DiscardButtonPresses - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call Func_f2dd set 7, [hl] ld a, [$d718] @@ -30099,7 +30099,7 @@ Func_f2b5: ; f2b5 (3:72b5) jp PlaySound Func_f2dd: ; f2dd (3:72dd) - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 res 1, [hl] res 6, [hl] ret @@ -30109,7 +30109,7 @@ _AddPokemonToParty: ; f2e5 (3:72e5) ld a, [$cc49] and $f jr z, .asm_f2f2 - ld de, W_ENEMYMONCOUNT ; $d89c + ld de, wEnemyPartyCount ; $d89c .asm_f2f2 ld a, [de] inc a @@ -30158,7 +30158,7 @@ _AddPokemonToParty: ; f2e5 (3:72e5) ld a, [$cc49] and $f jr z, .asm_f34c - ld hl, W_WATERRATE ; $d8a4 + ld hl, wEnemyMons ; $d8a4 .asm_f34c ld a, [$FF00+$e4] dec a @@ -30191,7 +30191,7 @@ _AddPokemonToParty: ; f2e5 (3:72e5) dec a ld c, a ld b, $2 - ld hl, W_OWNEDPOKEMON ; $d2f7 + ld hl, wPokedexOwned ; $d2f7 call _HandleBitArray ld a, c ld [$d153], a @@ -30202,7 +30202,7 @@ _AddPokemonToParty: ; f2e5 (3:72e5) push bc call _HandleBitArray pop bc - ld hl, W_SEENPOKEMON ; $d30a + ld hl, wPokedexSeen ; $d30a call _HandleBitArray pop hl push hl @@ -30290,10 +30290,10 @@ _AddPokemonToParty: ; f2e5 (3:72e5) ld a, $3e call Predef ; indirect jump to WriteMonMoves (3afb8 (e:6fb8)) pop de - ld a, [W_PLAYERIDHI] ; set trainer ID to player ID + ld a, [wPlayerID] ; set trainer ID to player ID inc de ld [de], a - ld a, [W_PLAYERIDLO] + ld a, [wPlayerID + 1] inc de ld [de], a push de @@ -30430,11 +30430,11 @@ _AddEnemyMonToPlayerParty: ; f49d (3:749d) dec a ld c, a ld b, $1 - ld hl, W_OWNEDPOKEMON + ld hl, wPokedexOwned push bc call _HandleBitArray ; add to owned pokemon pop bc - ld hl, W_SEENPOKEMON + ld hl, wPokedexSeen call _HandleBitArray ; add to seen pokemon and a ret ; return success @@ -30502,7 +30502,7 @@ Func_f51e: ; f51e (3:751e) ld hl, W_PARTYMON1DATA ; $d16b ld bc, W_PARTYMON2DATA - W_PARTYMON1DATA ; $2c .asm_f591 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call AddNTimes .asm_f597 push hl @@ -30549,7 +30549,7 @@ Func_f51e: ; f51e (3:751e) jr z, .asm_f5ec ld hl, W_PARTYMON1OT ; $d273 .asm_f5e6 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call SkipFixedLengthTextEntries .asm_f5ec ld bc, $b @@ -30579,7 +30579,7 @@ Func_f51e: ; f51e (3:751e) jr z, .asm_f62a ld hl, W_PARTYMON1NAME ; $d2b5 .asm_f624 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call SkipFixedLengthTextEntries .asm_f62a ld bc, $b @@ -30971,21 +30971,21 @@ Func_f839: ; f839 (3:7839) InitializePlayerData: ; f850 (3:7850) call GenRandom ld a, [H_RAND2] - ld [W_PLAYERIDHI], a ; set player trainer id + ld [wPlayerID], a ; set player trainer id call GenRandom ld a, [H_RAND1] - ld [W_PLAYERIDLO], a + ld [wPlayerID + 1], a ld a, $ff ld [$d71b], a ; XXX what's this? ld hl, W_NUMINPARTY ; $d163 call InitializeEmptyList ; no party mons ld hl, W_NUMINBOX ; $da80 call InitializeEmptyList ; no boxed mons - ld hl, W_NUMBAGITEMS ; $d31d + ld hl, wNumBagItems ; $d31d call InitializeEmptyList ; no items - ld hl, W_NUMBOXITEMS ; $d53a + ld hl, wNumBoxItems ; $d53a call InitializeEmptyList ; no boxed items - ld hl, W_PLAYERMONEY2 ; $d348 + ld hl, wPlayerMoney + 1 ; $d348 ld a, $30 ld [hld], a ; set money to 00 30 00 (3000) xor a @@ -30996,7 +30996,7 @@ InitializePlayerData: ; f850 (3:7850) ld hl, W_OBTAINEDBADGES ; $d356 ld [hli], a ; no badges obtained ld [hl], a ; XXX what's this? - ld hl, W_PLAYERCOINS1 ; $d5a4 + ld hl, wPlayerCoins ; $d5a4 ld [hli], a ; no coins ld [hl], a ld hl, W_GAMEPROGRESSFLAGS ; $d5f0 @@ -31014,7 +31014,7 @@ InitializeEmptyList: ; f8a0 (3:78a0) Func_f8a5: ; f8a5 (3:78a5) call Load16BitRegisters - ld hl, W_NUMBAGITEMS ; $d31d + ld hl, wNumBagItems ; $d31d .asm_f8ab inc hl ld a, [hli] @@ -31110,7 +31110,7 @@ Func_f929: ; f929 (3:7929) ld d, a ld a, [$c106] ld e, a - ld hl, $c100 + ld hl, wSpriteStateData1 ld a, [H_DIVIDEND] ; $FF00+$95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) add l add $4 @@ -31270,7 +31270,7 @@ UpdateHPBar_CalcNumberOfHPBarPixels: ; f9df (3:79df) ; predef $48 UpdateHPBar: ; fa1d (3:7a1d) push hl - ld hl, W_HPBAROLDHP + ld hl, wHPBarOldHP ld a, [hli] ld c, a ; old HP into bc ld a, [hli] @@ -31283,9 +31283,9 @@ UpdateHPBar: ; fa1d (3:7a1d) push bc call UpdateHPBar_CalcHPDifference ld a, e - ld [W_HPBARHPDIFFERENCE+1], a + ld [wHPBarHPDifference+1], a ld a, d - ld [W_HPBARHPDIFFERENCE], a + ld [wHPBarHPDifference], a pop bc pop de call UpdateHPBar_CompareNewHPToOldHP @@ -31294,26 +31294,26 @@ UpdateHPBar: ; fa1d (3:7a1d) jr c, .HPdecrease ld a, $1 .HPdecrease - ld [W_HPBARDELTA], a + ld [wHPBarDelta], a call Load16BitRegisters - ld a, [W_HPBARNEWHP] + ld a, [wHPBarNewHP] ld e, a - ld a, [W_HPBARNEWHP+1] + ld a, [wHPBarNewHP+1] ld d, a .animateHPBarLoop push de - ld a, [W_HPBAROLDHP] + ld a, [wHPBarOldHP] ld c, a - ld a, [W_HPBAROLDHP+1] + ld a, [wHPBarOldHP+1] ld b, a call UpdateHPBar_CompareNewHPToOldHP jr z, .animateHPBarDone jr nc, .HPIncrease dec bc ; subtract 1 HP ld a, c - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a ld a, b - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP+1], a call UpdateHPBar_CalcOldNewHPBarPixels ld a, e sub d ; calc pixel difference @@ -31321,9 +31321,9 @@ UpdateHPBar: ; fa1d (3:7a1d) .HPIncrease inc bc ; add 1 HP ld a, c - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a ld a, b - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP+1], a call UpdateHPBar_CalcOldNewHPBarPixels ld a, d sub e ; calc pixel difference @@ -31333,18 +31333,18 @@ UpdateHPBar: ; fa1d (3:7a1d) jr z, .noPixelDifference call UpdateHPBar_AnimateHPBar .noPixelDifference - ld a, [W_HPBARNEWHP] - ld [W_HPBAROLDHP], a - ld a, [W_HPBARNEWHP+1] - ld [W_HPBAROLDHP+1], a + ld a, [wHPBarNewHP] + ld [wHPBarOldHP], a + ld a, [wHPBarNewHP+1] + ld [wHPBarOldHP+1], a pop de jr .animateHPBarLoop .animateHPBarDone pop de ld a, e - ld [W_HPBAROLDHP], a + ld [wHPBarOldHP], a ld a, d - ld [W_HPBAROLDHP+1], a + ld [wHPBarOldHP+1], a or e jr z, .monFainted call UpdateHPBar_CalcOldNewHPBarPixels @@ -31368,7 +31368,7 @@ UpdateHPBar_AnimateHPBar: ; fab1 (3:7ab1) ld c, $2 call DelayFrames pop de - ld a, [W_HPBARDELTA] ; +1 or -1 + ld a, [wHPBarDelta] ; +1 or -1 add e cp $31 jr nc, .barFilledUp @@ -31425,12 +31425,12 @@ UpdateHPBar_CalcHPDifference: ; fad7 (3:7ad7) UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5) push af push de - ld a, [W_LISTMENUID] ; $cf94 + ld a, [wListMenuID] ; $cf94 and a jr z, .asm_fb2d - ld a, [W_HPBAROLDHP] + ld a, [wHPBarOldHP] ld [$cef1], a - ld a, [W_HPBAROLDHP+1] + ld a, [wHPBarOldHP+1] ld [$cef0], a push hl ld a, [$FF00+$f6] @@ -31463,7 +31463,7 @@ UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5) ; e: old pixels UpdateHPBar_CalcOldNewHPBarPixels: ; fb30 (3:7b30) push hl - ld hl, W_HPBARMAXHP + ld hl, wHPBarMaxHP ld a, [hli] ; max HP into de ld e, a ld a, [hli] @@ -31684,7 +31684,7 @@ Func_128f6: ; 128f6 (4:68f6) call Load16BitRegisters ld a, $2 asm_128fb: ; 128fb (4:68fb) - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 push hl ld a, [$cf99] ld b, a @@ -31878,7 +31878,7 @@ StatusScreen: ; 12953 (4:6953) ld a, [$cc49] cp $3 ret z - ld a, [W_WHICHPOKEMON] + ld a, [wWhichPokemon] jp SkipFixedLengthTextEntries Unknown_12a95: ; 12a95 (4:6a95) @@ -32040,7 +32040,7 @@ StatusScreen2: ; 12b57 (4:6b57) push bc push hl push de - ld hl, W_CURMENUITEMID + ld hl, wCurrentMenuItem ld a, [hl] push af ld a, b @@ -32602,7 +32602,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) dec c jr .adjustMenuVariablesLoop .storeMenuVariables - ld hl,W_TOPMENUITEMY + ld hl,wTopMenuItemY ld a,c ld [hli],a ; top menu item Y ld a,[$fff7] @@ -32623,9 +32623,9 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) bit 1,a ; was the B button pressed? jp nz,.loop ; if the B button wasn't pressed - ld a,[W_MAXMENUITEMID] + ld a,[wMaxMenuItem] ld b,a - ld a,[W_CURMENUITEMID] ; menu selection + ld a,[wCurrentMenuItem] ; menu selection cp b jp z,.exitMenu ; if the player chose Cancel dec b @@ -32869,7 +32869,7 @@ StartMenu_Item: ; 13302 (4:7302) call PrintText jr .exitMenu .notInLinkBattle - ld bc,W_NUMBAGITEMS + ld bc,wNumBagItems ld hl,$cf8b ld a,c ld [hli],a @@ -32877,11 +32877,11 @@ StartMenu_Item: ; 13302 (4:7302) xor a ld [$cf93],a ld a,ITEMLISTMENU - ld [W_LISTMENUID],a + ld [wListMenuID],a ld a,[$cc2c] - ld [W_CURMENUITEMID],a + ld [wCurrentMenuItem],a call DisplayListMenuID - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] ld [$cc2c],a jr nc,.choseItem .exitMenu @@ -32910,7 +32910,7 @@ StartMenu_Item: ; 13302 (4:7302) ld a,$06 ; use/toss menu ld [$d125],a call DisplayTextBoxID - ld hl,W_TOPMENUITEMY + ld hl,wTopMenuItemY ld a,11 ld [hli],a ; top menu item Y ld a,14 @@ -32944,7 +32944,7 @@ StartMenu_Item: ; 13302 (4:7302) call PrintText jp ItemMenuLoop .notBicycle2 - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] and a jr nz,.tossItem .useItem @@ -32999,7 +32999,7 @@ StartMenu_Item: ; 13302 (4:7302) inc a jr z,.tossZeroItems .skipAskingQuantity - ld hl,W_NUMBAGITEMS + ld hl,wNumBagItems call TossItem .tossZeroItems jp ItemMenuLoop @@ -33175,7 +33175,7 @@ DrawTrainerInfo: ; 1349a (4:749a) call PlaceString FuncCoord 8,4 ld hl,Coord - ld de,W_PLAYERMONEY3 + ld de,wPlayerMoney ld c,$e3 call PrintBCDNumber FuncCoord 9,6 @@ -33287,15 +33287,15 @@ StartMenu_Option: ; 135f6 (4:75f6) Func_13613: ; 13613 (4:7613) call Func_13653 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d call Func_13625 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 call Func_13625 jp RedrawPartyMenu_ Func_13625: ; 13625 (4:7625) push af - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld bc, $28 call AddNTimes ld c, $28 @@ -33305,7 +33305,7 @@ Func_13625: ; 13625 (4:7625) dec c jr nz, .asm_13633 pop af - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld bc, $10 call AddNTimes ld de, $4 @@ -33323,7 +33323,7 @@ Func_13653: ; 13653 (4:7653) ld a, [$cc35] and a jr nz, .asm_13661 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 inc a ld [$cc35], a ret @@ -33333,8 +33333,8 @@ Func_13653: ; 13653 (4:7653) ld a, [$cc35] dec a ld b, a - ld a, [W_CURMENUITEMID] ; $cc26 - ld [W_WHICHTRADE], a ; $cd3d + ld a, [wCurrentMenuItem] ; $cc26 + ld [wWhichTrade], a ; $cd3d cp b jr nz, .asm_1367b xor a @@ -33349,7 +33349,7 @@ Func_13653: ; 13653 (4:7653) ld hl, W_PARTYMON1 ; $d164 ld d, h ld e, l - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 add l ld l, a jr nc, .asm_1368e @@ -33369,7 +33369,7 @@ Func_13653: ; 13653 (4:7653) ld [de], a ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA) ld bc, $2c - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 call AddNTimes push hl ld de, $cc97 @@ -33388,7 +33388,7 @@ Func_13653: ; 13653 (4:7653) ld bc, $2c call CopyData ld hl, W_PARTYMON1OT ; $d273 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 call SkipFixedLengthTextEntries push hl ld de, $cc97 @@ -33406,7 +33406,7 @@ Func_13653: ; 13653 (4:7653) ld bc, $b call CopyData ld hl, W_PARTYMON1NAME ; $d2b5 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 call SkipFixedLengthTextEntries push hl ld de, $cc97 @@ -33424,7 +33424,7 @@ Func_13653: ; 13653 (4:7653) ld bc, $b call CopyData ld a, [$cc35] - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d xor a ld [$cc35], a ld [$d07d], a @@ -33563,7 +33563,7 @@ Func_137aa: ; 137aa (4:77aa) inc hl or [hl] jr z, .asm_1380a - ld de, W_PLAYERMONEY1 ; $d349 + ld de, wPlayerMoney + 2 ; $d349 ld c, $3 ld a, $b call Predef ; indirect jump to Func_f81d (f81d (3:781d)) @@ -33590,7 +33590,7 @@ Func_137aa: ; 137aa (4:77aa) ld [hli], a ld [hli], a ld [hl], a - ld [W_LISTSCROLLOFFSET], a ; $cc36 + ld [wListScrollOffset], a ; $cc36 ld hl, $d060 ld b, $18 .asm_1383e @@ -33747,28 +33747,28 @@ Func_1392c: ; 1392c (4:792c) inc c .asm_13958 ld a, [hli] - ld [W_HPBARMAXHP+1], a + ld [wHPBarMaxHP+1], a ld a, [hl] - ld [W_HPBARMAXHP], a + ld [wHPBarMaxHP], a push bc ld bc, $fff2 add hl, bc pop bc ld a, [hl] - ld [W_HPBAROLDHP], a + ld [wHPBarOldHP], a sub c ld [hld], a - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a ld a, [hl] - ld [W_HPBAROLDHP+1], a + ld [wHPBarOldHP+1], a sbc b ld [hl], a - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP+1], a jr nc, .asm_13982 xor a ld [hli], a ld [hl], a - ld hl, W_HPBARNEWHP + ld hl, wHPBarNewHP ld [hli], a ld [hl], a .asm_13982 @@ -33782,7 +33782,7 @@ Func_1392c: ; 1392c (4:792c) ld hl, Coord xor a .asm_13990 - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 ld a, $48 call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) ld hl, UnnamedText_1399e ; $799e @@ -33951,7 +33951,7 @@ InitMapSprites: ; 1785b (5:785b) 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) - ld hl,$c100 + ld hl,wSpriteStateData1 ld de,$c20d ; Loop to copy picture ID's from $C1X0 to $C2XD for LoadMapSpriteTilePatterns. .copyPictureIDLoop @@ -33996,12 +33996,12 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) .checkIfAlreadyLoadedLoop ld a,e and a,$f0 - ld b,a ; b = offset of the $c200 sprite slot being checked against + ld b,a ; b = offset of the wSpriteStateData2 sprite slot being checked against ld a,l - and a,$f0 ; a = offset of current $c200 sprite slot + and a,$f0 ; a = offset of current wSpriteStateData2 sprite slot cp b ; done checking all previous sprite slots? jr z,.notAlreadyLoaded - ld a,[de] ; picture ID of the $c200 sprite slot being checked against + ld a,[de] ; picture ID of the wSpriteStateData2 sprite slot being checked against cp [hl] ; do the picture ID's match? jp z,.alreadyLoaded ld a,e @@ -34148,7 +34148,7 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) .alreadyLoaded ; if the current picture ID has already had its tile patterns loaded inc de ld a,[de] ; a = VRAM slot for the current picture ID (from $C2YE) - ld [hl],a ; store VRAM slot in current $c200 sprite slot (at $C2XE) + ld [hl],a ; store VRAM slot in current wSpriteStateData2 sprite slot (at $C2XE) .nextSpriteSlot ld a,l add a,$10 @@ -34998,18 +34998,18 @@ EmotionBubbles: ; 17cbd (5:7cbd) INCBIN "gfx/emotion_bubbles.2bpp" Func_17d7d: ; 17d7d (5:7d7d) - ld a, [W_PLAYERMONACCURACYMOD] ; $cd1e + ld a, [wPlayerMonAccuracyMod] ; $cd1e cp $86 jr z, .asm_17d8d cp $92 ret nz - ld a, [W_PLAYERMONEVASIONMOD] ; $cd1f + ld a, [wPlayerMonEvasionMod] ; $cd1f cp $8f ret nz .asm_17d8d ld a, [W_NUMINPARTY] ; $d163 dec a - ld [W_WHICHPOKEMON], a ; $cf92 + ld [wWhichPokemon], a ; $cf92 ld a, $1 ld [$ccd4], a ld a, $32 @@ -35025,13 +35025,13 @@ SubstituteEffectHandler: ; 17dad (5:7dad) ld c, 50 call DelayFrames ld hl, W_PLAYERMONMAXHP - ld de, W_PLAYERSUBSITUTEHP + ld de, wPlayerSubstituteHP ld bc, W_PLAYERBATTSTATUS2 ld a, [$ff00+$f3] ;whose turn? and a jr z, .notEnemy ld hl, W_ENEMYMONMAXHP - ld de, W_ENEMYSUBSITUTEHP + ld de, wEnemySubstituteHP ld bc, W_ENEMYBATTSTATUS2 .notEnemy ld a, [bc] ;load flags @@ -35100,13 +35100,13 @@ UnnamedText_17e27: ; 17e27 (5:7e27) db "@" ActivatePC: ; 17e2c (5:7e2c) - call SaveScreenTilesToBuffer2 ;XXX: copy background from W_SCREENTILESBUFFER to W_SCREENTILESBACKBUFFER2 + call SaveScreenTilesToBuffer2 ;XXX: copy background from wTileMap to wTileMapBackup2 ld a, $99 call PlaySound ;XXX: play sound or stop music ld hl, UnnamedText_17f23 ;player turned on PC call PrintText call WaitForSoundToFinish ;XXX: wait for sound to be done - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 set 3, [hl] call LoadScreenTilesFromBuffer2 ;XXX: restore saved screen call Delay3 @@ -35114,15 +35114,15 @@ PCMainMenu: ; 17e48 (5:7e48) ld b, BANK(Func_213c8) ld hl, Func_213c8 call Bankswitch - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 set 5, [hl] call HandleMenuInput bit 1, a ;if player pressed B jp nz, LogOff - ld a, [W_MAXMENUITEMID] + ld a, [wMaxMenuItem] cp a, 2 jr nz, .next ;if not 2 menu items (not counting log off) (2 occurs before you get the pokedex) - ld a, [W_CURMENUITEMID] + ld a, [wCurrentMenuItem] and a jp z, BillsPC ;if current menu item id is 0, it's bills pc cp a, 1 @@ -35131,7 +35131,7 @@ PCMainMenu: ; 17e48 (5:7e48) .next cp a, 3 jr nz, .next2 ;if not 3 menu items (not counting log off) (3 occurs after you get the pokedex, before you beat the pokemon league) - ld a, [W_CURMENUITEMID] + ld a, [wCurrentMenuItem] and a jp z, BillsPC ;if current menu item id is 0, it's bills pc cp a, 1 @@ -35140,7 +35140,7 @@ PCMainMenu: ; 17e48 (5:7e48) jp z, OaksPC ;if current menu item id is 2, it's oaks pc jp LogOff ;otherwise, it's 3, and you're logging off .next2 - ld a, [W_CURMENUITEMID] + ld a, [wCurrentMenuItem] and a jp z, BillsPC ;if current menu item id is 0, it's bills pc cp a, 1 @@ -35151,7 +35151,7 @@ PCMainMenu: ; 17e48 (5:7e48) jp z, PKMNLeague ;if current menu item id is 3, it's pkmnleague jp LogOff ;otherwise, it's 4, and you're logging off .playersPC - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 res 5, [hl] set 3, [hl] ld a, $9B @@ -35205,7 +35205,7 @@ LogOff: ; 17f13 (5:7f13) ld a, $9A call PlaySound ;XXX: play sound or stop music call WaitForSoundToFinish ;XXX: wait for sound to be done - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 res 3, [hl] res 5, [hl] ret @@ -35228,7 +35228,7 @@ UnnamedText_17f32: ; 17f32 (5:7f32) ; removes one of the specified item ID [$FFdb] from bag (if existent) RemoveItemByID: ; 17f37 (5:7f37) - ld hl, W_BAGITEM01 ; $d31e + ld hl, wBagItems ; $d31e ld a, [$FF00+$db] ld b, a xor a @@ -35248,8 +35248,8 @@ RemoveItemByID: ; 17f37 (5:7f37) ld a, $1 ld [$cf96], a ld a, [$FF00+$dc] - ld [W_WHICHPOKEMON], a ; $cf92 - ld hl, W_NUMBAGITEMS ; $d31d + ld [wWhichPokemon], a ; $cf92 + ld hl, wNumBagItems ; $d31d jp RemoveItemFromInventory SECTION "bank6",ROMX,BANK[$6] @@ -35876,7 +35876,7 @@ PalletTownScript0: ; 18e81 (6:4e81) ld a, (Music_MeetProfOak - $4000) / 3 ; “oak appears” music call PlayMusic ; plays music ld a,$FC - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a ld hl,$D74B set 7,[hl] @@ -35892,7 +35892,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2) ld [$FF8C],a call DisplayTextID ld a,$FF - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a ld a,0 ld [$CC4D],a ld a,$15 @@ -35928,7 +35928,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ld [$FF8C],a call MoveSprite ld a,$FF - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a ; trigger the next script ld a,3 @@ -35944,12 +35944,12 @@ PalletTownScript3: ; 18f12 (6:4f12) ld a,1 ld [$CF0D],a ld a,$FC - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a ld a,1 ld [$FF8C],a call DisplayTextID ld a,$FF - ld [W_JOYPADFORBIDDENBUTTONSMASK],a + ld [wJoypadForbiddenButtonsMask],a ld a,1 ld [$CF13],a xor a @@ -36139,7 +36139,7 @@ ViridianCityScript1: ; 19062 (6:5062) ld a, [$c235] ld [$ff00+$ee], a xor a - ld [W_LISTSCROLLOFFSET], a + ld [wListScrollOffset], a ; set up battle for Old Man ld a, $1 @@ -36164,13 +36164,13 @@ ViridianCityScript2: ; 1908f (6:508f) call UpdateSprites call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $f ld [$ff00+$8c], a call DisplayTextID xor a ld [W_BATTLETYPE], a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_VIRIDIANCITYCURSCRIPT], a ret @@ -36192,7 +36192,7 @@ Function190cf: ; 190cf (6:50cf) ld [$ccd3], a xor a ld [$c109], a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ret ViridianCityTextPointers: ; 190e4 (6:50e4) @@ -36431,7 +36431,7 @@ Function1925e: ; 1925e (6:525e) call ArePlayerCoordsInArray ret nc ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $5 ld [$ff00+$8c], a jp DisplayTextID @@ -36456,7 +36456,7 @@ PewterCityScript1: ; 19280 (6:5280) ld [$ff00+$8d], a call Func_34b9 call Func_2307 - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 set 4, [hl] ld a, $d ld [$ff00+$8c], a @@ -36504,7 +36504,7 @@ PewterCityScript3: ; 192e9 (6:52e9) ld a, $15 call Predef xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_PEWTERCITYCURSCRIPT], a ret @@ -36522,7 +36522,7 @@ PewterCityScript4: ; 19305 (6:5305) ld [$ff00+$8d], a call Func_34b9 call Func_2307 - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 set 4, [hl] ld a, $e ld [$ff00+$8c], a @@ -36570,7 +36570,7 @@ PewterCityScript6: ; 1936f (6:536f) ld a, $15 call Predef xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_PEWTERCITYCURSCRIPT], a ret @@ -36732,7 +36732,7 @@ CeruleanCityScript: ; 19480 (6:5480) CeruleanCity_Unknown1948c: ; 1948c (6:548c) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_CERULEANCITYCURSCRIPT], a ld a, $5 ld [$cc4d], a @@ -36751,14 +36751,14 @@ CeruleanCityScript4: ; 194a7 (6:54a7) cp $ff jp z, CeruleanCity_Unknown1948c ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d75b set 7, [hl] ld a, $2 ld [$ff00+$8c], a call DisplayTextID xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_CERULEANCITYCURSCRIPT], a ret @@ -36804,7 +36804,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) xor a ld [H_CURRENTPRESSEDBUTTONS], a ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, [$d362] cp $14 jr z, .asm_19535 ; 0x19526 $d @@ -36852,7 +36852,7 @@ CeruleanCityScript1: ; 19567 (6:5567) bit 0, a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $1 ld [$ff00+$8c], a call DisplayTextID @@ -36894,7 +36894,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) jp z, CeruleanCity_Unknown1948c call CeruleanCityFunction1955d ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d75a set 0, [hl] ld a, $1 @@ -36939,7 +36939,7 @@ CeruleanCityScript3: ; 19610 (6:5610) ld a, $11 call Predef xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call Func_2307 ld a, $0 ld [W_CERULEANCITYCURSCRIPT], a @@ -37259,7 +37259,7 @@ VermilionCityScript4: ; 19826 (6:5826) VermilionCityScript2: ; 19833 (6:5833) ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $40 ld [$ccd3], a ld [$ccd4], a @@ -37275,7 +37275,7 @@ VermilionCityScript3: ; 1984e (6:584e) and a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [H_CURRENTPRESSEDBUTTONS], a ld a, $0 ld [W_VERMILIONCITYCURSCRIPT], a @@ -37884,7 +37884,7 @@ VermilionHouse3TextPointers: ; 19c15 (6:5c15) VermilionHouse3Text1: ; 19c17 (6:5c17) db $08 ; asm ld a, $4 - ld [W_WHICHTRADE], a + ld [wWhichTrade], a ld a, $54 call Predef jp TextScriptEnd @@ -38773,7 +38773,7 @@ Func_1a3e0: ; 1a3e0 (6:63e0) call Func_1a609 jr nc, .asm_1a406 ld a, $fc - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d736 set 1, [hl] ld a, $1 @@ -38845,7 +38845,7 @@ Func_1a44c: ; 1a44c (6:644c) ld hl, W_FLAGS_D733 set 1, [hl] ld a, $fc - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ret Func_1a485: ; 1a485 (6:6485) @@ -39038,7 +39038,7 @@ Func_1a5e7: ; 1a5e7 (6:65e7) cp $94 ret z ld hl, Unknown_1a605 ; $6605 - ld a, [W_ENGAGEDTRAINERCLASS] + ld a, [wEngagedTrainerClass] ld b, a .asm_1a5f4 ld a, [hli] @@ -39129,7 +39129,7 @@ Func_1a672: ; 1a672 (6:6672) and e ret z ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d736 set 6, [hl] call Func_3486 @@ -39504,7 +39504,7 @@ Func_1c98a: ; 1c98a (7:498a) ld a, $14 ld [$d125], a call DisplayTextBoxID - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jp z, InitGame ld b, BANK(Func_73b6a) @@ -39524,23 +39524,23 @@ Func_1c9c6: ; 1c9c6 (7:49c6) ld [$cf8b], a ld a, h ld [$cf8c], a - ld a, [W_LISTSCROLLOFFSET] ; $cc36 + ld a, [wListScrollOffset] ; $cc36 push af xor a - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_LISTSCROLLOFFSET], a ; $cc36 + ld [wCurrentMenuItem], a ; $cc26 + ld [wListScrollOffset], a ; $cc36 ld [$cf93], a ld a, $4 - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 call DisplayListMenuID pop bc ld a, b - ld [W_LISTSCROLLOFFSET], a ; $cc36 + ld [wListScrollOffset], a ; $cc36 ret c ld hl, $d126 set 7, [hl] ld hl, $cc5b - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 add a ld d, $0 ld e, a @@ -39605,7 +39605,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) call Func_3486 xor a ld [$c109], a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $1 ld [W_CINNABARISLANDCURSCRIPT], a ret @@ -39846,7 +39846,7 @@ OaksLabScript4: ; 1cbd2 (7:4bd2) OaksLabScript5: ; 1cbfd (7:4bfd) ld a, $fc - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $11 ld [$ff00+$8c], a call DisplayTextID @@ -39865,7 +39865,7 @@ OaksLabScript5: ; 1cbfd (7:4bfd) ld hl, $d74b set 1, [hl] xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $6 ld [W_OAKSLABCURSCRIPT], a @@ -39988,7 +39988,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) bit 0, a ret nz ld a, $fc - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $1 ld [$ff00+$8c], a ld a, $4 @@ -40030,7 +40030,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld hl, $d74b set 2, [hl] xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $a ld [W_OAKSLABCURSCRIPT], a @@ -40106,7 +40106,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) set 6, [hl] set 7, [hl] xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $8 ld [$d528], a @@ -40116,7 +40116,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) OaksLabScript12: ; 1ce03 (7:4e03) ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $8 ld [$d528], a call UpdateSprites @@ -40177,7 +40177,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d) ld a, $11 call Predef xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call Func_2307 ; reset to map music ld a, $12 ld [W_OAKSLABCURSCRIPT], a @@ -40258,7 +40258,7 @@ OaksLabScript16: ; 1cf12 (7:4f12) call EnableAutoTextBoxDrawing call Func_2307 ld a, $fc - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call Function1CEFD ld a, $16 ld [$ff00+$8c], a @@ -40353,7 +40353,7 @@ OaksLabScript17: ; 1cfd4 (7:4fd4) ld a, $5 ld [W_PALLETTOWNCURSCRIPT], a xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $12 ld [W_OAKSLABCURSCRIPT], a @@ -40363,7 +40363,7 @@ OaksLabScript18: ; 1d009 (7:5009) ret Function1D00A: ; 1d00a (7:500a) - ld hl, W_BAGITEM01 + ld hl, wBagItems ld bc, $0000 .asm_1d010 ld a, [hli] @@ -40649,7 +40649,7 @@ asm_1d1e5: ; 1d1e5 (7:51e5) ld hl, $d72e set 3, [hl] ld a, $fc - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $8 ld [W_OAKSLABCURSCRIPT], a OaksLabMonChoiceEnd: ; 1d21f (7:521f) @@ -41396,7 +41396,7 @@ CeruleanHouseText1: ; 1d6fd (7:56fd) CeruleanHouseText2: ; 1d702 (7:5702) db $08 ; asm ld a, $6 - ld [W_WHICHTRADE], a + ld [wWhichTrade], a ld a, $54 call Predef jp TextScriptEnd @@ -41481,7 +41481,7 @@ BikeShopText1: ; 1d745 (7:5745) ld [$cc25], a ld hl, $d730 set 6, [hl] - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $4 ld c, $f call TextBoxBorder @@ -42029,7 +42029,7 @@ VermilionDockScript: ; 1db52 (7:5b52) ld [$c206], a ld [$cd3b], a dec a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ret .asm_1db8d bit 5, [hl] @@ -42037,14 +42037,14 @@ VermilionDockScript: ; 1db52 (7:5b52) ld a, [$cd38] and a ret nz - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a set 5, [hl] ret VermilionDock_1db9b: ; 1db9b (7:5b9b) set 2, [hl] ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [$c0ee], a call PlaySound ld c, BANK(Music_Surfing) @@ -42510,7 +42510,7 @@ Route2HouseText1: ; 1def4 (7:5ef4) Route2HouseText2: ; 1def9 (7:5ef9) db $08 ; asm ld a, $1 - ld [W_WHICHTRADE], a + ld [wWhichTrade], a ld a, $54 call Predef jp TextScriptEnd @@ -42600,7 +42600,7 @@ Route5GateScript1: ; 1df94 (7:5f94) ret nz call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_ROUTE5GATECURSCRIPT], a ret @@ -42745,7 +42745,7 @@ Route6GateScript1: ; 1e091 (7:6091) ret nz call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_ROUTE6GATECURSCRIPT], a ret @@ -42863,7 +42863,7 @@ Route7GateScript1: ; 1e16c (7:616c) ret nz call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_ROUTE7GATECURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -42968,7 +42968,7 @@ Route8GateScript1: ; 1e231 (7:6231) ret nz call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_ROUTE8GATECURSCRIPT], a ret @@ -43430,7 +43430,7 @@ Func_1e6ba: ; 1e6ba (7:66ba) ld a, $80 ld [$ccd3], a ld [$c109], a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a jp Func_3486 Route22GateScript1: ; 1e6cd (7:66cd) @@ -43438,7 +43438,7 @@ Route22GateScript1: ; 1e6cd (7:66cd) and a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call Delay3 ld a, $0 ld [W_ROUTE22GATECURSCRIPT], a @@ -43562,7 +43562,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6) ld hl, $d7f2 set 6, [hl] xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $3 ld [W_BILLSHOUSECURSCRIPT], a ret @@ -43572,7 +43572,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5) bit 3, a ret z ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $2 ld [$cf13], a ld a, $c @@ -43606,7 +43606,7 @@ BillsHouseScript4: ; 1e80d (7:680d) bit 0, a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d7f2 set 5, [hl] ld hl, $d7f1 @@ -43751,7 +43751,7 @@ Func_1e915: ; 1e915 (7:6915) ld hl, UnnamedText_1e93b ; $693b call PrintText call YesNoChoice - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jr nz, .asm_1e932 ld a, $56 @@ -43819,17 +43819,17 @@ Func_1e988: ; 1e988 (7:6988) jr asm_1e9ab Func_1e997: ; 1e997 (7:6997) - ld a, [W_SAFARITIMER1] ; $d70d + ld a, [wSafariSteps] ; $d70d ld b, a - ld a, [W_SAFARITIMER2] ; $d70e + ld a, [wSafariSteps + 1] ; $d70e ld c, a or b jr z, asm_1e9b0 dec bc ld a, b - ld [W_SAFARITIMER1], a ; $d70d + ld [wSafariSteps], a ; $d70d ld a, c - ld [W_SAFARITIMER2], a ; $d70e + ld [wSafariSteps + 1], a ; $d70e asm_1e9ab: ; 1e9ab (7:69ab) xor a ld [$da46], a @@ -43837,7 +43837,7 @@ asm_1e9ab: ; 1e9ab (7:69ab) asm_1e9b0: ; 1e9b0 (7:69b0) call EnableAutoTextBoxDrawing xor a - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a dec a call PlaySound ld c, BANK(SFX_02_5f) @@ -43866,7 +43866,7 @@ asm_1e9b0: ; 1e9b0 (7:69b0) Func_1e9ed: ; 1e9ed (7:69ed) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, Unknown_1e9f7 ; $69f7 jp PrintText @@ -43900,7 +43900,7 @@ UnnamedText_1ea12: ; 1ea12 (7:6a12) INCBIN "baserom.gbc",$1ea25,$1ea26 - $1ea25 xor a ld [$da38], a - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d push af and $f ld [$FF00+$db], a @@ -43971,7 +43971,7 @@ Func_1ea92: ; 1ea92 (7:6a92) call YesNoChoice ld a, [$FF00+$dc] ld c, a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp c jr nz, .asm_1eab8 ld hl, $d126 @@ -44179,7 +44179,7 @@ INCBIN "baserom.gbc",$1ec05,$1ec06 - $1ec05 .asm_1ec2d ld hl, $d730 set 6, [hl] - ld hl, $c3a0 + ld hl, wTileMap ld b, $a ld c, $9 call TextBoxBorder @@ -44238,28 +44238,28 @@ UnnamedText_1ecbd: ; 1ecbd (7:6cbd) SECTION "bank8",ROMX,BANK[$8] -INCLUDE "music/headers/sfxheaders08.tx" -INCLUDE "music/headers/musicheaders08.tx" - -INCLUDE "music/sfx/sfx_08_01.tx" -INCLUDE "music/sfx/sfx_08_02.tx" -INCLUDE "music/sfx/sfx_08_03.tx" -INCLUDE "music/sfx/sfx_08_04.tx" -INCLUDE "music/sfx/sfx_08_05.tx" -INCLUDE "music/sfx/sfx_08_06.tx" -INCLUDE "music/sfx/sfx_08_07.tx" -INCLUDE "music/sfx/sfx_08_08.tx" -INCLUDE "music/sfx/sfx_08_09.tx" -INCLUDE "music/sfx/sfx_08_0a.tx" -INCLUDE "music/sfx/sfx_08_0b.tx" -INCLUDE "music/sfx/sfx_08_0c.tx" -INCLUDE "music/sfx/sfx_08_0d.tx" -INCLUDE "music/sfx/sfx_08_0e.tx" -INCLUDE "music/sfx/sfx_08_0f.tx" -INCLUDE "music/sfx/sfx_08_10.tx" -INCLUDE "music/sfx/sfx_08_11.tx" -INCLUDE "music/sfx/sfx_08_12.tx" -INCLUDE "music/sfx/sfx_08_13.tx" +INCLUDE "music/headers/sfxheaders08.asm" +INCLUDE "music/headers/musicheaders08.asm" + +INCLUDE "music/sfx/sfx_08_01.asm" +INCLUDE "music/sfx/sfx_08_02.asm" +INCLUDE "music/sfx/sfx_08_03.asm" +INCLUDE "music/sfx/sfx_08_04.asm" +INCLUDE "music/sfx/sfx_08_05.asm" +INCLUDE "music/sfx/sfx_08_06.asm" +INCLUDE "music/sfx/sfx_08_07.asm" +INCLUDE "music/sfx/sfx_08_08.asm" +INCLUDE "music/sfx/sfx_08_09.asm" +INCLUDE "music/sfx/sfx_08_0a.asm" +INCLUDE "music/sfx/sfx_08_0b.asm" +INCLUDE "music/sfx/sfx_08_0c.asm" +INCLUDE "music/sfx/sfx_08_0d.asm" +INCLUDE "music/sfx/sfx_08_0e.asm" +INCLUDE "music/sfx/sfx_08_0f.asm" +INCLUDE "music/sfx/sfx_08_10.asm" +INCLUDE "music/sfx/sfx_08_11.asm" +INCLUDE "music/sfx/sfx_08_12.asm" +INCLUDE "music/sfx/sfx_08_13.asm" Music8_Channel3DutyPointers: ; 20361 (1f:4361) dw Music8_Channel3Duty1 @@ -44287,105 +44287,105 @@ Music8_Channel3Duty4: ; 203a3 (8:43a3) Music8_Channel3Duty5: ; 203b3 (8:43b3) db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 -INCLUDE "music/sfx/sfx_08_40.tx" -INCLUDE "music/sfx/sfx_08_3f.tx" -INCLUDE "music/sfx/sfx_08_3c.tx" -INCLUDE "music/sfx/sfx_08_3d.tx" -INCLUDE "music/sfx/sfx_08_3e.tx" -INCLUDE "music/sfx/sfx_08_77.tx" -INCLUDE "music/sfx/sfx_08_41.tx" -INCLUDE "music/sfx/sfx_08_42.tx" -INCLUDE "music/sfx/sfx_08_43.tx" -INCLUDE "music/sfx/sfx_08_44.tx" -INCLUDE "music/sfx/sfx_08_45.tx" -INCLUDE "music/sfx/sfx_08_pokeflute_ch3.tx" -INCLUDE "music/sfx/sfx_08_47.tx" -INCLUDE "music/sfx/sfx_08_48.tx" -INCLUDE "music/sfx/sfx_08_49.tx" -INCLUDE "music/sfx/sfx_08_4a.tx" -INCLUDE "music/sfx/sfx_08_4b.tx" -INCLUDE "music/sfx/sfx_08_4c.tx" -INCLUDE "music/sfx/sfx_08_4d.tx" -INCLUDE "music/sfx/sfx_08_4e.tx" -INCLUDE "music/sfx/sfx_08_4f.tx" -INCLUDE "music/sfx/sfx_08_50.tx" -INCLUDE "music/sfx/sfx_08_51.tx" -INCLUDE "music/sfx/sfx_08_52.tx" -INCLUDE "music/sfx/sfx_08_53.tx" -INCLUDE "music/sfx/sfx_08_54.tx" -INCLUDE "music/sfx/sfx_08_55.tx" -INCLUDE "music/sfx/sfx_08_56.tx" -INCLUDE "music/sfx/sfx_08_57.tx" -INCLUDE "music/sfx/sfx_08_58.tx" -INCLUDE "music/sfx/sfx_08_59.tx" -INCLUDE "music/sfx/sfx_08_5a.tx" -INCLUDE "music/sfx/sfx_08_5b.tx" -INCLUDE "music/sfx/sfx_08_5c.tx" -INCLUDE "music/sfx/sfx_08_5d.tx" -INCLUDE "music/sfx/sfx_08_5e.tx" -INCLUDE "music/sfx/sfx_08_5f.tx" -INCLUDE "music/sfx/sfx_08_60.tx" -INCLUDE "music/sfx/sfx_08_61.tx" -INCLUDE "music/sfx/sfx_08_62.tx" -INCLUDE "music/sfx/sfx_08_63.tx" -INCLUDE "music/sfx/sfx_08_64.tx" -INCLUDE "music/sfx/sfx_08_65.tx" -INCLUDE "music/sfx/sfx_08_66.tx" -INCLUDE "music/sfx/sfx_08_67.tx" -INCLUDE "music/sfx/sfx_08_68.tx" -INCLUDE "music/sfx/sfx_08_69.tx" -INCLUDE "music/sfx/sfx_08_6a.tx" -INCLUDE "music/sfx/sfx_08_6b.tx" -INCLUDE "music/sfx/sfx_08_6c.tx" -INCLUDE "music/sfx/sfx_08_6d.tx" -INCLUDE "music/sfx/sfx_08_6e.tx" -INCLUDE "music/sfx/sfx_08_6f.tx" -INCLUDE "music/sfx/sfx_08_70.tx" -INCLUDE "music/sfx/sfx_08_71.tx" -INCLUDE "music/sfx/sfx_08_72.tx" -INCLUDE "music/sfx/sfx_08_73.tx" -INCLUDE "music/sfx/sfx_08_74.tx" -INCLUDE "music/sfx/sfx_08_75.tx" -INCLUDE "music/sfx/sfx_08_76.tx" -INCLUDE "music/sfx/sfx_08_unused.tx" -INCLUDE "music/sfx/sfx_08_1d.tx" -INCLUDE "music/sfx/sfx_08_37.tx" -INCLUDE "music/sfx/sfx_08_38.tx" -INCLUDE "music/sfx/sfx_08_25.tx" -INCLUDE "music/sfx/sfx_08_39.tx" -INCLUDE "music/sfx/sfx_08_17.tx" -INCLUDE "music/sfx/sfx_08_23.tx" -INCLUDE "music/sfx/sfx_08_24.tx" -INCLUDE "music/sfx/sfx_08_14.tx" -INCLUDE "music/sfx/sfx_08_22.tx" -INCLUDE "music/sfx/sfx_08_1a.tx" -INCLUDE "music/sfx/sfx_08_1b.tx" -INCLUDE "music/sfx/sfx_08_19.tx" -INCLUDE "music/sfx/sfx_08_1f.tx" -INCLUDE "music/sfx/sfx_08_20.tx" -INCLUDE "music/sfx/sfx_08_16.tx" -INCLUDE "music/sfx/sfx_08_21.tx" -INCLUDE "music/sfx/sfx_08_15.tx" -INCLUDE "music/sfx/sfx_08_1e.tx" -INCLUDE "music/sfx/sfx_08_1c.tx" -INCLUDE "music/sfx/sfx_08_18.tx" -INCLUDE "music/sfx/sfx_08_2d.tx" -INCLUDE "music/sfx/sfx_08_2a.tx" -INCLUDE "music/sfx/sfx_08_2f.tx" -INCLUDE "music/sfx/sfx_08_26.tx" -INCLUDE "music/sfx/sfx_08_27.tx" -INCLUDE "music/sfx/sfx_08_28.tx" -INCLUDE "music/sfx/sfx_08_32.tx" -INCLUDE "music/sfx/sfx_08_29.tx" -INCLUDE "music/sfx/sfx_08_2b.tx" -INCLUDE "music/sfx/sfx_08_30.tx" -INCLUDE "music/sfx/sfx_08_2e.tx" -INCLUDE "music/sfx/sfx_08_31.tx" -INCLUDE "music/sfx/sfx_08_2c.tx" -INCLUDE "music/sfx/sfx_08_33.tx" -INCLUDE "music/sfx/sfx_08_34.tx" -INCLUDE "music/sfx/sfx_08_35.tx" -INCLUDE "music/sfx/sfx_08_36.tx" +INCLUDE "music/sfx/sfx_08_40.asm" +INCLUDE "music/sfx/sfx_08_3f.asm" +INCLUDE "music/sfx/sfx_08_3c.asm" +INCLUDE "music/sfx/sfx_08_3d.asm" +INCLUDE "music/sfx/sfx_08_3e.asm" +INCLUDE "music/sfx/sfx_08_77.asm" +INCLUDE "music/sfx/sfx_08_41.asm" +INCLUDE "music/sfx/sfx_08_42.asm" +INCLUDE "music/sfx/sfx_08_43.asm" +INCLUDE "music/sfx/sfx_08_44.asm" +INCLUDE "music/sfx/sfx_08_45.asm" +INCLUDE "music/sfx/sfx_08_pokeflute_ch3.asm" +INCLUDE "music/sfx/sfx_08_47.asm" +INCLUDE "music/sfx/sfx_08_48.asm" +INCLUDE "music/sfx/sfx_08_49.asm" +INCLUDE "music/sfx/sfx_08_4a.asm" +INCLUDE "music/sfx/sfx_08_4b.asm" +INCLUDE "music/sfx/sfx_08_4c.asm" +INCLUDE "music/sfx/sfx_08_4d.asm" +INCLUDE "music/sfx/sfx_08_4e.asm" +INCLUDE "music/sfx/sfx_08_4f.asm" +INCLUDE "music/sfx/sfx_08_50.asm" +INCLUDE "music/sfx/sfx_08_51.asm" +INCLUDE "music/sfx/sfx_08_52.asm" +INCLUDE "music/sfx/sfx_08_53.asm" +INCLUDE "music/sfx/sfx_08_54.asm" +INCLUDE "music/sfx/sfx_08_55.asm" +INCLUDE "music/sfx/sfx_08_56.asm" +INCLUDE "music/sfx/sfx_08_57.asm" +INCLUDE "music/sfx/sfx_08_58.asm" +INCLUDE "music/sfx/sfx_08_59.asm" +INCLUDE "music/sfx/sfx_08_5a.asm" +INCLUDE "music/sfx/sfx_08_5b.asm" +INCLUDE "music/sfx/sfx_08_5c.asm" +INCLUDE "music/sfx/sfx_08_5d.asm" +INCLUDE "music/sfx/sfx_08_5e.asm" +INCLUDE "music/sfx/sfx_08_5f.asm" +INCLUDE "music/sfx/sfx_08_60.asm" +INCLUDE "music/sfx/sfx_08_61.asm" +INCLUDE "music/sfx/sfx_08_62.asm" +INCLUDE "music/sfx/sfx_08_63.asm" +INCLUDE "music/sfx/sfx_08_64.asm" +INCLUDE "music/sfx/sfx_08_65.asm" +INCLUDE "music/sfx/sfx_08_66.asm" +INCLUDE "music/sfx/sfx_08_67.asm" +INCLUDE "music/sfx/sfx_08_68.asm" +INCLUDE "music/sfx/sfx_08_69.asm" +INCLUDE "music/sfx/sfx_08_6a.asm" +INCLUDE "music/sfx/sfx_08_6b.asm" +INCLUDE "music/sfx/sfx_08_6c.asm" +INCLUDE "music/sfx/sfx_08_6d.asm" +INCLUDE "music/sfx/sfx_08_6e.asm" +INCLUDE "music/sfx/sfx_08_6f.asm" +INCLUDE "music/sfx/sfx_08_70.asm" +INCLUDE "music/sfx/sfx_08_71.asm" +INCLUDE "music/sfx/sfx_08_72.asm" +INCLUDE "music/sfx/sfx_08_73.asm" +INCLUDE "music/sfx/sfx_08_74.asm" +INCLUDE "music/sfx/sfx_08_75.asm" +INCLUDE "music/sfx/sfx_08_76.asm" +INCLUDE "music/sfx/sfx_08_unused.asm" +INCLUDE "music/sfx/sfx_08_1d.asm" +INCLUDE "music/sfx/sfx_08_37.asm" +INCLUDE "music/sfx/sfx_08_38.asm" +INCLUDE "music/sfx/sfx_08_25.asm" +INCLUDE "music/sfx/sfx_08_39.asm" +INCLUDE "music/sfx/sfx_08_17.asm" +INCLUDE "music/sfx/sfx_08_23.asm" +INCLUDE "music/sfx/sfx_08_24.asm" +INCLUDE "music/sfx/sfx_08_14.asm" +INCLUDE "music/sfx/sfx_08_22.asm" +INCLUDE "music/sfx/sfx_08_1a.asm" +INCLUDE "music/sfx/sfx_08_1b.asm" +INCLUDE "music/sfx/sfx_08_19.asm" +INCLUDE "music/sfx/sfx_08_1f.asm" +INCLUDE "music/sfx/sfx_08_20.asm" +INCLUDE "music/sfx/sfx_08_16.asm" +INCLUDE "music/sfx/sfx_08_21.asm" +INCLUDE "music/sfx/sfx_08_15.asm" +INCLUDE "music/sfx/sfx_08_1e.asm" +INCLUDE "music/sfx/sfx_08_1c.asm" +INCLUDE "music/sfx/sfx_08_18.asm" +INCLUDE "music/sfx/sfx_08_2d.asm" +INCLUDE "music/sfx/sfx_08_2a.asm" +INCLUDE "music/sfx/sfx_08_2f.asm" +INCLUDE "music/sfx/sfx_08_26.asm" +INCLUDE "music/sfx/sfx_08_27.asm" +INCLUDE "music/sfx/sfx_08_28.asm" +INCLUDE "music/sfx/sfx_08_32.asm" +INCLUDE "music/sfx/sfx_08_29.asm" +INCLUDE "music/sfx/sfx_08_2b.asm" +INCLUDE "music/sfx/sfx_08_30.asm" +INCLUDE "music/sfx/sfx_08_2e.asm" +INCLUDE "music/sfx/sfx_08_31.asm" +INCLUDE "music/sfx/sfx_08_2c.asm" +INCLUDE "music/sfx/sfx_08_33.asm" +INCLUDE "music/sfx/sfx_08_34.asm" +INCLUDE "music/sfx/sfx_08_35.asm" +INCLUDE "music/sfx/sfx_08_36.asm" Func_2136e: ; 2136e (8:536e) ld a, [$d083] @@ -44459,24 +44459,24 @@ Func_213c8: ; 213c8 (8:53c8) ld a, [$d5a2] and a jr nz, .asm_213f3 - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $8 ld c, $e jr .asm_213fa .asm_213ea - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $6 ld c, $e jr .asm_213fa .asm_213f3 - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $a ld c, $e .asm_213fa call TextBoxBorder call UpdateSprites ld a, $3 - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 ld a, [$d7f1] bit 0, a jr nz, .asm_21414 @@ -44509,7 +44509,7 @@ Func_213c8: ; 213c8 (8:53c8) and a jr z, .asm_2145a ld a, $4 - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 FuncCoord 2, 8 ; $c442 ld hl, Coord ld de, PKMNLeaguePCText ; $54b2 @@ -44525,21 +44525,21 @@ Func_213c8: ; 213c8 (8:53c8) jr .asm_2146d .asm_21462 ld a, $2 - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 FuncCoord 2, 6 ; $c41a ld hl, Coord ld de, LogOffPCText ; $54ba .asm_2146d call PlaceString ld a, $3 - ld [W_MENUWATCHEDKEYS], a ; $cc29 + ld [wMenuWatchedKeys], a ; $cc29 ld a, $2 - ld [W_TOPMENUITEMY], a ; $cc24 + ld [wTopMenuItemY], a ; $cc24 ld a, $1 - ld [W_TOPMENUITEMX], a ; $cc25 + ld [wTopMenuItemX], a ; $cc25 xor a - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_OLDMENUITEMID], a ; $cc2a + ld [wCurrentMenuItem], a ; $cc26 + ld [wLastMenuItem], a ; $cc2a ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba ret @@ -44571,9 +44571,9 @@ BillsPC_: ; 0x214c2 inc a ; MONSTER_NAME ld [W_LISTTYPE], a call LoadHpBarAndStatusTilePatterns - ld a, [W_LISTSCROLLOFFSET] ; $cc36 + ld a, [wListScrollOffset] ; $cc36 push af - ld a, [W_FLAGS_CD60] + ld a, [wFlags_0xcd60] bit 3, a jr nz, BillsPCMenu ld a, $99 @@ -44584,13 +44584,13 @@ BillsPC_: ; 0x214c2 Func_214e8: ; 214e8 (8:54e8) BillsPCMenu: ld a, [$ccd3] - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld hl, $9780 ld de, PokeballTileGraphics ; $697e ld bc, (BANK(PokeballTileGraphics) << 8) + $01 call CopyVideoData call LoadScreenTilesFromBuffer2DisableBGTransfer - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $a ld c, $c call TextBoxBorder @@ -44598,7 +44598,7 @@ BillsPCMenu: ld hl, Coord ld de, BillsPCMenuText ; $56e1 call PlaceString - ld hl, W_TOPMENUITEMY ; $cc24 + ld hl, wTopMenuItemY ; $cc24 ld a, $2 ld [hli], a dec a @@ -44612,10 +44612,10 @@ BillsPCMenu: xor a ld [hli], a ld [hli], a - ld hl, W_LISTSCROLLOFFSET ; $cc36 + ld hl, wListScrollOffset ; $cc36 ld [hli], a ld [hl], a - ld [W_PLAYERMONNUMBER], a ; $cc2f + ld [wPlayerMonNumber], a ; $cc2f ld hl, WhatText call PrintText FuncCoord 9, 14 ; $c4c1 @@ -44649,7 +44649,7 @@ BillsPCMenu: bit 1, a jp nz, Func_21588 ; b button call PlaceUnfilledArrowMenuCursor - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld [$ccd3], a and a jp z, Func_21618 ; withdraw @@ -44661,7 +44661,7 @@ BillsPCMenu: jp z, Func_216b3 ; change box Func_21588: ; 21588 (8:5588) - ld a, [W_FLAGS_CD60] + ld a, [wFlags_0xcd60] bit 3, a jr nz, .asm_2159a call LoadTextBoxTilePatterns @@ -44669,11 +44669,11 @@ Func_21588: ; 21588 (8:5588) call PlaySound call WaitForSoundToFinish .asm_2159a - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 res 5, [hl] call LoadScreenTilesFromBuffer2 pop af - ld [W_LISTSCROLLOFFSET], a ; $cc36 + ld [wListScrollOffset], a ; $cc36 ld hl, $d730 res 6, [hl] ret @@ -44709,7 +44709,7 @@ BillsPCDeposit: ld [$cf95], a call RemovePokemon call WaitForSoundToFinish - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d ld a, [$d5a0] and $7f cp $9 @@ -44748,7 +44748,7 @@ Func_21618: ; 21618 (8:5618) jp c, Func_214e8 call Func_2174b jp nc, Func_214e8 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, $de06 call GetPartyMonName ld a, [$cf91] @@ -44779,7 +44779,7 @@ Func_21673: ; 21673 (8:5673) ld hl, OnceReleasedText ; $581b call PrintText call YesNoChoice - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jr nz, .asm_21682 inc a @@ -44805,13 +44805,13 @@ Func_216be: ; 216be (8:56be) ld [$cf8c], a xor a ld [$cf93], a - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 inc a ; MONSTER_NAME ld [W_LISTTYPE], a ld a, [$cc2b] - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 call DisplayListMenuID - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld [$cc2b], a ret @@ -44873,7 +44873,7 @@ Func_2174b: ; 2174b (8:574b) ld hl, Coord ld de, StatsCancelPCText ; $57dc call PlaceString - ld hl, W_TOPMENUITEMY ; $cc24 + ld hl, wTopMenuItemY ; $cc24 ld a, $c ld [hli], a ld a, $a @@ -44887,16 +44887,16 @@ Func_2174b: ; 2174b (8:574b) ld [hli], a xor a ld [hl], a - ld hl, W_LISTSCROLLOFFSET ; $cc36 + ld hl, wListScrollOffset ; $cc36 ld [hli], a ld [hl], a - ld [W_PLAYERMONNUMBER], a ; $cc2f + ld [wPlayerMonNumber], a ; $cc2f ld [$cc2b], a .asm_2178f call HandleMenuInput bit 1, a jr nz, .asm_2179f - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jr z, .asm_217a1 dec a @@ -46777,18 +46777,18 @@ Music8_OverwriteChannelPointer: ; 2231d (8:631d) ld [hli], a ret -INCLUDE "music/sfx/sfx_08_pokeflute.tx" -INCLUDE "music/sfx/sfx_08_unused2.tx" -INCLUDE "music/gymleaderbattle.tx" -INCLUDE "music/trainerbattle.tx" -INCLUDE "music/wildbattle.tx" -INCLUDE "music/finalbattle.tx" -INCLUDE "music/sfx/sfx_08_3a.tx" -INCLUDE "music/sfx/sfx_08_3b.tx" -INCLUDE "music/sfx/sfx_08_46.tx" -INCLUDE "music/defeatedtrainer.tx" -INCLUDE "music/defeatedwildmon.tx" -INCLUDE "music/defeatedgymleader.tx" +INCLUDE "music/sfx/sfx_08_pokeflute.asm" +INCLUDE "music/sfx/sfx_08_unused2.asm" +INCLUDE "music/gymleaderbattle.asm" +INCLUDE "music/trainerbattle.asm" +INCLUDE "music/wildbattle.asm" +INCLUDE "music/finalbattle.asm" +INCLUDE "music/sfx/sfx_08_3a.asm" +INCLUDE "music/sfx/sfx_08_3b.asm" +INCLUDE "music/sfx/sfx_08_46.asm" +INCLUDE "music/defeatedtrainer.asm" +INCLUDE "music/defeatedwildmon.asm" +INCLUDE "music/defeatedgymleader.asm" SECTION "bank9",ROMX,BANK[$9] @@ -47500,7 +47500,7 @@ BadgeNumbersTileGraphics: ; 2fd98 (b:7d98) INCBIN "gfx/badge_numbers.2bpp" Func_2fe18: ; 2fe18 (b:7e18) - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1_MOVE1 ; $d173 ld bc, $2c call AddNTimes @@ -48045,7 +48045,7 @@ Unknown_372a0: ; 372a0 (d:72a0) INCBIN "baserom.gbc",$372a0,$372ac - $372a0 Func_372ac: ; 372ac (d:72ac) - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $b0 jr z, .asm_372ba cp $b1 @@ -54969,7 +54969,7 @@ Func_39bd5: ; 39bd5 (e:5bd5) ld a, [$d11b] cp $1 jr nz, .asm_39be6 - ld hl, W_ENEMYMONCOUNT ; $d89c + ld hl, wEnemyPartyCount ; $d89c ld de, $d9ac ld a, $6 jr .asm_39c18 @@ -54990,7 +54990,7 @@ Func_39bd5: ; 39bd5 (e:5bd5) .asm_39c02 cp $2 jr nz, .asm_39c10 - ld hl, W_NUMBAGITEMS ; $d31d + ld hl, wNumBagItems ; $d31d ld de, ItemNames ; $472b ld a, $4 jr .asm_39c18 @@ -55040,10 +55040,10 @@ ReadTrainer: ; 39c53 (e:5c53) and a ret nz -; set [W_ENEMYMONCOUNT] to 0, [$D89D] to FF +; set [wEnemyPartyCount] to 0, [$D89D] to FF ; XXX first is total enemy pokemon? ; XXX second is species of first pokemon? - ld hl,W_ENEMYMONCOUNT + ld hl,wEnemyPartyCount xor a ld [hli],a dec a @@ -56004,7 +56004,7 @@ TrainerAI: ; 3a52e (e:652e) add hl,bc add hl,bc add hl,bc - ld a,[W_AICOUNT] + ld a,[wAICount] and a ret z ; if no AI uses left, we're done here inc hl @@ -56012,7 +56012,7 @@ TrainerAI: ; 3a52e (e:652e) jr nz,.getpointer dec hl ld a,[hli] - ld [W_AICOUNT],a + ld [wAICount],a .getpointer ld a,[hli] ld h,[hl] @@ -56199,7 +56199,7 @@ GenericAI: ; 3a693 (e:6693) ; end of individual trainer AI routines DecrementAICount: ; 3a695 (e:6695) - ld hl,W_AICOUNT + ld hl,wAICount dec [hl] scf ret @@ -56213,7 +56213,7 @@ AIUseFullRestore: ; 3a6a0 (e:66a0) call AICureStatus ld a,FULL_RESTORE ld [$CF05],a - ld de,W_HPBAROLDHP + ld de,wHPBarOldHP ld hl,$CFE7 ld a,[hld] ld [de],a @@ -56225,11 +56225,11 @@ AIUseFullRestore: ; 3a6a0 (e:66a0) ld a,[hld] ld [de],a inc de - ld [W_HPBARMAXHP],a + ld [wHPBarMaxHP],a ld [$CFE7],a ld a,[hl] ld [de],a - ld [W_HPBARMAXHP+1],a + ld [wHPBarMaxHP+1],a ld [W_ENEMYMONCURHP],a jr Function6718 @@ -56256,17 +56256,17 @@ AIRecoverHP: ; 3a6da (e:66da) ld [$CF05],a ld hl,$CFE7 ld a,[hl] - ld [W_HPBAROLDHP],a + ld [wHPBarOldHP],a add b ld [hld],a - ld [W_HPBARNEWHP],a + ld [wHPBarNewHP],a ld a,[hl] - ld [W_HPBAROLDHP+1],a - ld [W_HPBARNEWHP+1],a + ld [wHPBarOldHP+1],a + ld [wHPBarNewHP+1],a jr nc,.next inc a ld [hl],a - ld [W_HPBARNEWHP+1],a + ld [wHPBarNewHP+1],a .next inc hl ld a,[hld] @@ -56274,22 +56274,22 @@ AIRecoverHP: ; 3a6da (e:66da) ld de,$CFF5 ld a,[de] dec de - ld [W_HPBARMAXHP],a + ld [wHPBarMaxHP],a sub b ld a,[hli] ld b,a ld a,[de] - ld [W_HPBARMAXHP+1],a + ld [wHPBarMaxHP+1],a sbc b jr nc,Function6718 inc de ld a,[de] dec de ld [hld],a - ld [W_HPBARNEWHP],a + ld [wHPBarNewHP],a ld a,[de] ld [hl],a - ld [W_HPBARNEWHP+1],a + ld [wHPBarNewHP+1],a ; fallthrough Function6718: ; 3a718 (e:6718) @@ -56303,7 +56303,7 @@ Function6718: ; 3a718 (e:6718) jp DecrementAICount Function672A: ; 3a72a (e:672a) - ld a,[W_ENEMYMONCOUNT] + ld a,[wEnemyPartyCount] ld c,a ld hl,W_ENEMYMON1HP @@ -56522,13 +56522,13 @@ SetupOwnPartyPokeballs: ; 3a869 (e:6869) ld [hl], a ld a, $8 ld [$cd3e], a - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer jp Func_3a8e1 SetupEnemyPartyPokeballs: ; 3a887 (e:6887) call Func_3a919 - ld hl, $d8a4 - ld de, W_ENEMYMONCOUNT ; $d89c + ld hl, wEnemyMons + ld de, wEnemyPartyCount ; $d89c call SetupPokeballs ld hl, W_BASECOORDX ; $d081 ld a, $48 @@ -56542,7 +56542,7 @@ SetupEnemyPartyPokeballs: ; 3a887 (e:6887) SetupPokeballs: ; 0x3a8a6 ld a, [de] push af - ld de, W_BUFFER + ld de, wBuffer ld c, $6 ; max num of partymons ld a, $34 ; empty pokeball .emptyloop @@ -56551,7 +56551,7 @@ SetupPokeballs: ; 0x3a8a6 dec c jr nz, .emptyloop ; 0x3a8b2 $fb pop af - ld de, W_BUFFER + ld de, wBuffer .monloop push af call PickPokeball @@ -56664,10 +56664,10 @@ Func_3a948: ; 3a948 (e:6948) ld [hl], $40 ld a, $8 ld [$cd3e], a - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer call Func_3a8e1 - ld hl, W_WATERRATE ; $d8a4 - ld de, W_ENEMYMONCOUNT ; $d89c + ld hl, wEnemyMons ; $d8a4 + ld de, wEnemyPartyCount ; $d89c call SetupPokeballs ld hl, W_BASECOORDX ; $d081 ld a, $50 @@ -56692,7 +56692,7 @@ Func_3ad0e: ; 3ad0e (e:6d0e) ld hl, $ccd3 xor a ld [hl], a - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld c, a ld b, $1 call Func_3b057 @@ -56703,14 +56703,14 @@ Func_3ad1c: ; 3ad1c (e:6d1c) xor a ld [$d121], a dec a - ld [W_WHICHPOKEMON], a ; $cf92 + ld [wWhichPokemon], a ; $cf92 push hl push bc push de ld hl, W_NUMINPARTY ; $d163 push hl asm_3ad2e: ; 3ad2e (e:6d2e) - ld hl, W_WHICHPOKEMON ; $cf92 + ld hl, wWhichPokemon ; $cf92 inc [hl] pop hl inc hl @@ -56719,7 +56719,7 @@ asm_3ad2e: ; 3ad2e (e:6d2e) jp z, Func_3aede ld [$cee9], a push hl - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld c, a ld hl, $ccd3 ld b, $2 @@ -56796,7 +56796,7 @@ Func_3ad71: ; 3ad71 (e:6d71) push hl ld a, [hl] ld [$ceea], a - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1NAME ; $d2b5 call GetPartyMonName call CopyStringToCF4B @@ -56806,7 +56806,7 @@ Func_3ad71: ; 3ad71 (e:6d71) call DelayFrames xor a ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld bc, $c14 call ClearScreenArea ld a, $1 @@ -56861,7 +56861,7 @@ Func_3ad71: ; 3ad71 (e:6d71) ld de, $cfba ld b, $1 call CalcStats - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA) ld bc, $2c call AddNTimes @@ -56908,11 +56908,11 @@ Func_3ad71: ; 3ad71 (e:6d71) dec a ld c, a ld b, $1 - ld hl, W_OWNEDPOKEMON ; $d2f7 + ld hl, wPokedexOwned ; $d2f7 push bc call Func_3b057 pop bc - ld hl, W_SEENPOKEMON ; $d30a + ld hl, wPokedexSeen ; $d30a call Func_3b057 pop de pop hl @@ -56965,7 +56965,7 @@ Func_3aef7: ; 3aef7 (e:6ef7) ret nz cp $50 jr nz, .asm_3af0e - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld bc, $b ld hl, W_PARTYMON1NAME ; $d2b5 call AddNTimes @@ -57037,7 +57037,7 @@ Func_3af5b: ; 3af5b (e:6f5b) and a jr nz, .asm_3af96 ld hl, W_PARTYMON1_MOVE1 ; $d173 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld bc, $2c call AddNTimes .asm_3af96 @@ -57099,7 +57099,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8) ld a, [$cee9] and a jr z, .skipMinLevelCheck - ld a, [W_WHICHTRADE] ; $cd3d (min move level) + ld a, [wWhichTrade] ; $cd3d (min move level) cp b jr nc, .nextMove2 ; min level >= move level .skipMinLevelCheck @@ -59402,26 +59402,26 @@ Func_3b9ec: ; 3b9ec (e:79ec) pop hl .asm_3ba37 ld a, [hld] - ld [W_HPBARMAXHP], a + ld [wHPBarMaxHP], a ld c, a ld a, [hl] - ld [W_HPBARMAXHP+1], a + ld [wHPBarMaxHP+1], a ld b, a jr z, .asm_3ba47 srl b rr c .asm_3ba47 ld a, [de] - ld [W_HPBAROLDHP], a + ld [wHPBarOldHP], a add c ld [de], a - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a dec de ld a, [de] - ld [W_HPBAROLDHP+1], a + ld [wHPBarOldHP+1], a adc b ld [de], a - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP+1], a inc hl inc de ld a, [de] @@ -59433,11 +59433,11 @@ Func_3b9ec: ; 3b9ec (e:79ec) jr c, .asm_3ba6f ld a, [hli] ld [de], a - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP+1], a inc de ld a, [hl] ld [de], a - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a .asm_3ba6f ld hl, Func_3fba8 ; $7ba8 call BankswitchEtoF @@ -59451,7 +59451,7 @@ Func_3b9ec: ; 3b9ec (e:79ec) ld hl, Coord xor a .asm_3ba83 - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 ld a, $48 call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) ld hl, Func_3cd5a ; $4d5a @@ -59488,7 +59488,7 @@ Func_3bab1: ; 3bab1 (e:7ab1) ld hl, $cfe5 ld de, W_PLAYERMONID ld bc, W_PLAYERBATTSTATUS3 ; $d064 - ld [W_PLAYERMOVELISTINDEX], a ; $cc2e + ld [wPlayerMoveListIndex], a ; $cc2e ld a, [W_PLAYERBATTSTATUS1] ; $d062 .asm_3bad1 bit 6, a @@ -59590,8 +59590,8 @@ Func_3bab1: ; 3bab1 (e:7ab1) ld hl, $cd26 ld de, $cd12 call Func_3bb7d - ld hl, W_ENEMYMONATTACKMOD ; $cd2e - ld de, W_PLAYERMONATTACKMOD ; $cd1a + ld hl, wEnemyMonStatMods ; $cd2e + ld de, wPlayerMonStatMods ; $cd1a call Func_3bb7d ld hl, UnnamedText_3bb92 ; $7b92 jp PrintText @@ -59704,7 +59704,7 @@ Func_3c04c: ; 3c04c (f:404c) ld a, b or c jr nz, .asm_3c06f - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld de, $9800 ld b, $12 .asm_3c07f @@ -59813,7 +59813,7 @@ Func_3c11e: ; 3c11e (f:411e) ld [$cd6a], a inc a ld [$d11d], a - ld hl, W_WATERMONS ; $d8a5 (aliases: W_ENEMYMON1HP) + ld hl, W_ENEMYMON1HP ; $d8a5 ld bc, $2b ld d, $3 .asm_3c134 @@ -59885,16 +59885,16 @@ UnnamedText_3c1a8: ; 3c1a8 (f:41a8) Func_3c1ad: ; 3c1ad (f:41ad) xor a - ld [W_WHICHPOKEMON], a ; $cf92 + ld [wWhichPokemon], a ; $cf92 .asm_3c1b1 call Func_3ca97 jr nz, .asm_3c1bc - ld hl, W_WHICHPOKEMON ; $cf92 + ld hl, wWhichPokemon ; $cf92 inc [hl] jr .asm_3c1b1 .asm_3c1bc - ld a, [W_WHICHPOKEMON] ; $cf92 - ld [W_PLAYERMONNUMBER], a ; $cc2f + ld a, [wWhichPokemon] ; $cf92 + ld [wPlayerMonNumber], a ; $cc2f inc a ld hl, W_NUMINPARTY ; $d163 ld c, a @@ -59909,7 +59909,7 @@ Func_3c1ad: ; 3c1ad (f:41ad) ld a, $9 call Func_3c8df call SaveScreenTilesToBuffer1 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld c, a ld b, $1 push bc @@ -60031,32 +60031,32 @@ MainInBattleLoop: ; 3c233 (f:4233) ld a, [hl] cp $76 jr nz, .asm_3c2dd ; 0x3c2d8 $3 - ld [W_PLAYERSELECTEDMOVE], a + ld [wPlayerSelectedMove], a .asm_3c2dd ld hl, Function674B ld b, BANK(Function674B) call Bankswitch .noLinkBattle - ld a, [W_PLAYERSELECTEDMOVE] + ld a, [wPlayerSelectedMove] cp QUICK_ATTACK jr nz, .playerDidNotUseQuickAttack - ld a, [W_ENEMYSELECTEDMOVE] + ld a, [wEnemySelectedMove] cp QUICK_ATTACK jr z, .compareSpeed ; both used Quick Attack jp .playerMovesFirst ; player used Quick Attack .playerDidNotUseQuickAttack - ld a, [W_ENEMYSELECTEDMOVE] + ld a, [wEnemySelectedMove] cp QUICK_ATTACK jr z, .enemyMovesFirst - ld a, [W_PLAYERSELECTEDMOVE] + ld a, [wPlayerSelectedMove] cp COUNTER jr nz, .playerDidNotUseCounter - ld a, [W_ENEMYSELECTEDMOVE] + ld a, [wEnemySelectedMove] cp COUNTER jr z, .compareSpeed ; both used Counter jr .enemyMovesFirst ; player used Counter .playerDidNotUseCounter - ld a, [W_ENEMYSELECTEDMOVE] + ld a, [wEnemySelectedMove] cp COUNTER jr z, .playerMovesFirst .compareSpeed @@ -60227,10 +60227,10 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ; 3c43d (f:443d) ld bc, $e ; skip to max HP add hl, bc ld a, [hli] ; load max HP - ld [W_HPBARMAXHP+1], a + ld [wHPBarMaxHP+1], a ld b, a ld a, [hl] - ld [W_HPBARMAXHP], a + ld [wHPBarMaxHP], a ld c, a srl b rr c @@ -60267,21 +60267,21 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ; 3c43d (f:443d) pop hl inc hl ld a, [hl] ; subtract total damage from current HP - ld [W_HPBAROLDHP], a + ld [wHPBarOldHP], a sub c ld [hld], a - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a ld a, [hl] - ld [W_HPBAROLDHP+1], a + ld [wHPBarOldHP+1], a sbc b ld [hl], a - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP+1], a jr nc, .noOverkill xor a ; overkill: zero HP ld [hli], a ld [hl], a - ld [W_HPBARNEWHP], a - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP], a + ld [wHPBarNewHP+1], a .noOverkill call UpdateCurMonHPBar pop hl @@ -60297,36 +60297,36 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3) ld hl, W_PLAYERMONMAXHP ; $d023 .playersTurn ld a, [hli] - ld [W_HPBARMAXHP+1], a + ld [wHPBarMaxHP+1], a ld a, [hl] - ld [W_HPBARMAXHP], a + ld [wHPBarMaxHP], a ld de, $fff2 add hl, de ; skip back fomr max hp to current hp ld a, [hl] - ld [W_HPBAROLDHP], a ; add bc to current HP + ld [wHPBarOldHP], a ; add bc to current HP add c ld [hld], a - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a ld a, [hl] - ld [W_HPBAROLDHP+1], a + ld [wHPBarOldHP+1], a adc b ld [hli], a - ld [W_HPBARNEWHP+1], a - ld a, [W_HPBARMAXHP] + ld [wHPBarNewHP+1], a + ld a, [wHPBarMaxHP] ld c, a ld a, [hld] sub c - ld a, [W_HPBARMAXHP+1] + ld a, [wHPBarMaxHP+1] ld b, a ld a, [hl] sbc b jr c, .noOverfullHeal ld a, b ; overfull heal, set HP to max HP ld [hli], a - ld [W_HPBARNEWHP+1], a + ld [wHPBarNewHP+1], a ld a, c ld [hl], a - ld [W_HPBARNEWHP], a + ld [wHPBarNewHP], a .noOverfullHeal ld a, [H_WHOSETURN] ; $FF00+$f3 xor $1 @@ -60350,7 +60350,7 @@ UpdateCurMonHPBar: ; 3c4f6 (f:44f6) xor a .playersTurn push bc - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 ld a, $48 call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) pop bc @@ -60437,7 +60437,7 @@ FaintEnemyPokemon ; 0x3c567 FuncCoord 12, 6 ; $c424 ld de, Coord call Func_3c893 - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld bc, $40b call ClearScreenArea ld a, [W_ISINBATTLE] ; $d057 @@ -60527,10 +60527,10 @@ Func_3c643: ; 3c643 (f:4643) ret Func_3c64f: ; 3c64f (f:464f) - ld a, [W_ENEMYMONCOUNT] ; $d89c + ld a, [wEnemyPartyCount] ; $d89c ld b, a xor a - ld hl, W_WATERMONS ; $d8a5 (aliases: W_ENEMYMON1HP) + ld hl, W_ENEMYMON1HP ; $d8a5 ld de, $2c .asm_3c65a or [hl] @@ -60597,7 +60597,7 @@ TrainerBattleVictory: ; 3c696 (f:4696) call Func_3381 ld hl, MoneyForWinningText ; $46e4 call PrintText - ld de, W_PLAYERMONEY1 ; $d349 + ld de, wPlayerMoney + 2 ; $d349 ld hl, $d07b ld c, $3 ld a, $b @@ -60653,7 +60653,7 @@ HandlePlayerMonFainted: ; 3c700 (f:4700) jp MainInBattleLoop Func_3c741: ; 3c741 (f:4741) - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f ld c, a ld hl, W_PLAYERMONSALIVEFLAGS ; clear fainted mon's alive flag ld b, $0 @@ -60718,7 +60718,7 @@ Func_3c79b: ; 3c79b (f:479b) and a ret .asm_3c7c4 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jr z, .asm_3c7ad ld hl, W_PARTYMON1_SPEED ; $d193 @@ -60751,8 +60751,8 @@ Func_3c7d8: ; 3c7d8 (f:47d8) xor a ld [$cd6a], a call CleanLCD_OAM - ld a, [W_WHICHPOKEMON] ; $cf92 - ld [W_PLAYERMONNUMBER], a ; $cc2f + ld a, [wWhichPokemon] ; $cf92 + ld [wPlayerMonNumber], a ; $cc2f ld c, a ld hl, W_PLAYERMONSALIVEFLAGS ld b, $1 @@ -60784,7 +60784,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) ld a, [W_CUROPPONENT] ; $d059 cp $c8 + SONY1 jr nz, .notSony1Battle - ld hl, W_SCREENTILESBUFFER ; sony 1 battle + ld hl, wTileMap ; sony 1 battle ld bc, $815 call ClearScreenArea call Func_3ed12 @@ -60944,7 +60944,7 @@ Func_3c92a: ; 3c92a (f:492a) ld [hli],a ld [hl],a dec a - ld [W_AICOUNT],a + ld [wAICount],a ld hl,W_PLAYERBATTSTATUS1 res 5,[hl] FuncCoord 18, 0 ; $c3b2 @@ -61054,7 +61054,7 @@ Func_3c92a: ; 3c92a (f:492a) call LoadScreenTilesFromBuffer1 .next4 call CleanLCD_OAM - ld hl,W_SCREENTILESBUFFER + ld hl,wTileMap ld bc,$040B call ClearScreenArea ld b,1 @@ -61101,7 +61101,7 @@ AnyPokemonAliveCheck: ; 3ca83 (f:4a83) ld e, a xor a ld hl, W_PARTYMON1_HP ; $d16c - ld bc, W_PARTYMON2_HP - W_PARTYMON1_HP - 1 ; $2b + ld bc, W_PARTYMON2DATA - W_PARTYMON1DATA - 1 .partyMonsLoop or [hl] inc hl @@ -61113,7 +61113,7 @@ AnyPokemonAliveCheck: ; 3ca83 (f:4a83) ret Func_3ca97: ; 3ca97 (f:4a97) - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1_HP ; $d16c ld bc, $2c call AddNTimes @@ -61226,7 +61226,7 @@ Func_3cab9: ; 3cab9 (f:4ab9) xor a ld [$cd6a], a ld a, $f - ld [W_PLAYERMOVELISTINDEX], a ; $cc2e + ld [wPlayerMoveListIndex], a ; $cc2e call Func_3d605 call LoadScreenTilesFromBuffer1 ld a, [$cc3e] @@ -61258,7 +61258,7 @@ UnnamedText_3cba1: ; 3cba1 (f:4ba1) db "@" Func_3cba6: ; 3cba6 (f:4ba6) - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld bc, $2c ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA) call AddNTimes @@ -61280,7 +61280,7 @@ Func_3cba6: ; 3cba6 (f:4ba6) ld [$d0b5], a call GetMonHeader ld hl, W_PARTYMON1NAME ; $d2b5 - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f call SkipFixedLengthTextEntries ld de, W_PLAYERMONNAME ld bc, $b @@ -61293,7 +61293,7 @@ Func_3cba6: ; 3cba6 (f:4ba6) call Func_3ee19 ld a, $7 ld b, $8 - ld hl, W_PLAYERMONATTACKMOD ; $cd1a + ld hl, wPlayerMonAttackMod ; $cd1a .asm_3cc0e ld [hli], a dec b @@ -61301,9 +61301,9 @@ Func_3cba6: ; 3cba6 (f:4ba6) ret Func_3cc13: ; 3cc13 (f:4c13) - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld bc, $2c - ld hl, W_WATERRATE ; $d8a4 + ld hl, wEnemyMons ; $d8a4 call AddNTimes ld de, $cfe5 ld bc, $c @@ -61323,7 +61323,7 @@ Func_3cc13: ; 3cc13 (f:4c13) ld [$d0b5], a call GetMonHeader ld hl, $d9ee - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call SkipFixedLengthTextEntries ld de, W_ENEMYMONNAME ld bc, $b @@ -61344,12 +61344,12 @@ Func_3cc13: ; 3cc13 (f:4c13) jr nz, .asm_3cc79 ld a, $7 ld b, $8 - ld hl, W_ENEMYMONATTACKMOD ; $cd2e + ld hl, wEnemyMonStatMods ; $cd2e .asm_3cc86 ld [hli], a dec b jr nz, .asm_3cc86 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld [W_ENEMYMONNUMBER], a ; $cfe8 ret @@ -61443,9 +61443,9 @@ Func_3cd3a: ; 3cd3a (f:4d3a) ; reads player's current mon's HP into W_PLAYERMONCURHP ReadPlayerMonCurHPAndStatus: ; 3cd43 (f:4d43) - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f ld hl, W_PARTYMON1_HP ; $d16c - ld bc, W_PARTYMON2_HP - W_PARTYMON1_HP ; $2c + ld bc, W_PARTYMON2DATA - W_PARTYMON1DATA call AddNTimes ld d, h ld e, l @@ -61529,7 +61529,7 @@ Func_3cd60: ; 3cd60 (f:4d60) Func_3cdec: ; 3cdec (f:4dec) xor a ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld bc, $40c call ClearScreenArea ld hl, Func_3a919 @@ -61609,7 +61609,7 @@ Func_3cdec: ; 3cdec (f:4dec) Func_3ce7f: ; 3ce7f (f:4e7f) xor a - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 FuncCoord 2, 2 ; $c3ca ld hl, Coord call DrawHPBar @@ -61701,12 +61701,12 @@ OldManName: ; 3cf12 (f:4f12) RegularBattleMenu: ; 3cf1a (f:4f1a) ld a, [$cc2d] - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_OLDMENUITEMID], a ; $cc2a + ld [wCurrentMenuItem], a ; $cc26 + ld [wLastMenuItem], a ; $cc2a sub $2 jr c, .leftcolumn - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_OLDMENUITEMID], a ; $cc2a + ld [wCurrentMenuItem], a ; $cc26 + ld [wLastMenuItem], a ; $cc2a jr .rightcolumn .leftcolumn ld a, [W_BATTLETYPE] ; $d05a @@ -61731,7 +61731,7 @@ RegularBattleMenu: ; 3cf1a (f:4f1a) call PrintNumber ld b, $1 .notsafari - ld hl, W_TOPMENUITEMY ; $cc24 + ld hl, wTopMenuItemY ; $cc24 ld a, $e ld [hli], a ld a, b @@ -61768,7 +61768,7 @@ RegularBattleMenu: ; 3cf1a (f:4f1a) call PrintNumber ld b, $d .notsafarirightcolumn - ld hl, W_TOPMENUITEMY ; $cc24 + ld hl, wTopMenuItemY ; $cc24 ld a, $e ld [hli], a ld a, b @@ -61782,14 +61782,14 @@ RegularBattleMenu: ; 3cf1a (f:4f1a) call HandleMenuInput bit 5, a jr nz, .leftcolumn - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 add $2 ; if we're in the right column, the actual id is +2 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 .selection call PlaceUnfilledArrowMenuCursor ld a, [W_BATTLETYPE] ; $d05a cp $2 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld [$cc2d], a jr z, .asm_3cfd0 cp $1 @@ -61853,7 +61853,7 @@ asm_3d00e: ; 3d00e (f:500e) db $01, $04, $32, $ff .asm_3d031 - ld hl, W_NUMBAGITEMS ; $d31d + ld hl, wNumBagItems ; $d31d ld a, l ld [$cf8b], a ld a, h @@ -61862,11 +61862,11 @@ asm_3d00e: ; 3d00e (f:500e) xor a ld [$cf93], a ld a, $3 - ld [W_LISTMENUID], a ; $cf94 + ld [wListMenuID], a ; $cf94 ld a, [$cc2c] - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 call DisplayListMenuID - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld [$cc2c], a ld a, $0 ld [$cc37], a @@ -61883,7 +61883,7 @@ asm_3d05f: ; 3d05f (f:505f) call Func_3ee5b call CleanLCD_OAM xor a - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld a, [W_BATTLETYPE] ; $d05a cp $2 jr z, .asm_3d09c @@ -61968,7 +61968,7 @@ Func_3d119: ; 3d119 (f:5119) ld a, $c ld [$d125], a call DisplayTextBoxID - ld hl, W_TOPMENUITEMY ; $cc24 + ld hl, wTopMenuItemY ; $cc24 ld a, $c ld [hli], a ld [hli], a @@ -61985,7 +61985,7 @@ Func_3d119: ; 3d119 (f:5119) bit 1, a jr nz, Func_3d105 call PlaceUnfilledArrowMenuCursor - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp $2 jr z, asm_3d0f0 and a @@ -62019,9 +62019,9 @@ Func_3d119: ; 3d119 (f:5119) .asm_3d187 jp Func_3d0e0 .asm_3d18a - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f ld d, a - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 cp d jr nz, .asm_3d19d ld hl, UnnamedText_3d1f5 ; $51f5 @@ -62046,8 +62046,8 @@ Func_3d1ba: ; 3d1ba (f:51ba) ld c, $32 call DelayFrames call Func_3ccfa - ld a, [W_WHICHPOKEMON] ; $cf92 - ld [W_PLAYERMONNUMBER], a ; $cc2f + ld a, [wWhichPokemon] ; $cf92 + ld [wPlayerMonNumber], a ; $cc2f ld c, a ld b, $1 push bc @@ -62062,7 +62062,7 @@ Func_3d1ba: ; 3d1ba (f:51ba) call Func_3cc91 call SaveScreenTilesToBuffer1 ld a, $2 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 and a ret @@ -62073,7 +62073,7 @@ UnnamedText_3d1f5: ; 3d1f5 (f:51f5) Func_3d1fa: ; 3d1fa (f:51fa) call LoadScreenTilesFromBuffer1 ld a, $3 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld hl, W_PLAYERMONSPEED ld de, W_ENEMYMONSPEED call Func_3cab9 @@ -62086,7 +62086,7 @@ Func_3d1fa: ; 3d1fa (f:51fa) jp InitBattleMenu MoveSelectionMenu: ; 3d219 (f:5219) - ld a, [W_MOVEMENUTYPE] + ld a, [wMoveMenuType] dec a jr z, .mimicmenu dec a @@ -62152,7 +62152,7 @@ MoveSelectionMenu: ; 3d219 (f:5219) ld a, $7 jr .menuset .relearnmenu - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1_MOVE1 ; $d173 ld bc, $2c call AddNTimes @@ -62168,25 +62168,25 @@ MoveSelectionMenu: ; 3d219 (f:5219) ld b, $5 ld a, $7 .menuset - ld hl, W_TOPMENUITEMY ; $cc24 + ld hl, wTopMenuItemY ; $cc24 ld [hli], a ld a, b - ld [hli], a ; W_TOPMENUITEMX - ld a, [W_MOVEMENUTYPE] + ld [hli], a ; wTopMenuItemX + ld a, [wMoveMenuType] cp $1 jr z, .selectedmoveknown ld a, $1 jr nc, .selectedmoveknown - ld a, [W_PLAYERMOVELISTINDEX] ; $cc2e + ld a, [wPlayerMoveListIndex] ; $cc2e inc a .selectedmoveknown - ld [hli], a ; W_CURMENUITEMID - inc hl ; W_TILEBEHINDCURSOR untouched + ld [hli], a ; wCurrentMenuItem + inc hl ; wTileBehindCursor untouched ld a, [$cd6c] inc a inc a - ld [hli], a ; W_MAXMENUITEMID - ld a, [W_MOVEMENUTYPE] + ld [hli], a ; wMaxMenuItem + ld a, [wMoveMenuType] dec a ld b, $c1 ; can't use B jr z, .matchedkeyspicked @@ -62203,17 +62203,17 @@ MoveSelectionMenu: ; 3d219 (f:5219) ld b, $ff .matchedkeyspicked ld a, b - ld [hli], a ; W_MENUWATCHEDKEYS - ld a, [W_MOVEMENUTYPE] + ld [hli], a ; wMenuWatchedKeys + ld a, [wMoveMenuType] cp $1 jr z, .movelistindex1 - ld a, [W_PLAYERMOVELISTINDEX] ; $cc2e + ld a, [wPlayerMoveListIndex] ; $cc2e inc a .movelistindex1 - ld [hl], a ; W_OLDMENUITEMID + ld [hl], a ; wLastMenuItem Func_3d2fe: ; 3d2fe (f:52fe) - ld a, [W_MOVEMENUTYPE] + ld a, [wMoveMenuType] and a jr z, .battleselect dec a @@ -62253,11 +62253,11 @@ Func_3d2fe: ; 3d2fe (f:52fe) push af xor a ld [$cc35], a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 dec a - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld b, a - ld a, [W_MOVEMENUTYPE] + ld a, [wMoveMenuType] dec a ; if not mimic jr nz, .nob pop af @@ -62265,7 +62265,7 @@ Func_3d2fe: ; 3d2fe (f:52fe) .nob dec a ld a, b - ld [W_PLAYERMOVELISTINDEX], a ; $cc2e + ld [wPlayerMoveListIndex], a ; $cc2e jr nz, .moveselected pop af ret @@ -62273,7 +62273,7 @@ Func_3d2fe: ; 3d2fe (f:52fe) pop af ret nz ld hl, W_PLAYERMONPP ; $d02d - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld c, a ld b, $0 add hl, bc @@ -62290,13 +62290,13 @@ Func_3d2fe: ; 3d2fe (f:52fe) bit 3, a ; transformed jr nz, .dummy ; game freak derp .dummy - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld hl, W_PLAYERMONMOVES ld c, a ld b, $0 add hl, bc ld a, [hl] - ld [W_PLAYERSELECTEDMOVE], a ; $ccdc + ld [wPlayerSelectedMove], a ; $ccdc xor a ret .disabled @@ -62321,17 +62321,17 @@ WhichTechniqueString: ; 3d3b8 (f:53b8) db "WHICH TECHNIQUE?@" Func_3d3c9: ; 3d3c9 (f:53c9) - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jp nz, Func_3d2fe call EraseMenuCursor ld a, [$cd6c] inc a - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 jp Func_3d2fe Func_3d3dd: ; 3d3dd (f:53dd) - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld b, a ld a, [$cd6c] inc a @@ -62340,12 +62340,12 @@ Func_3d3dd: ; 3d3dd (f:53dd) jp nz, Func_3d2fe call EraseMenuCursor ld a, $1 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 jp Func_3d2fe Func_3d3f5: ; 3d3f5 (f:53f5) ld a, $a5 - ld [W_PLAYERSELECTEDMOVE], a ; $ccdc + ld [wPlayerSelectedMove], a ; $ccdc ld a, [W_PLAYERDISABLEDMOVE] ; $d06d and a ld hl, W_PLAYERMONPP ; $d02d @@ -62402,7 +62402,7 @@ Func_3d435: ; 3d435 (f:5435) swap a and $f ld b, a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp b jr nz, .asm_3d463 ld a, [hl] @@ -62420,13 +62420,13 @@ Func_3d435: ; 3d435 (f:5435) ld a, [hl] and $f ld b, a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 swap a add b ld [hl], a .asm_3d474 ld hl, W_PARTYMON1_MOVE1 ; $d173 - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f ld bc, $2c call AddNTimes push hl @@ -62449,7 +62449,7 @@ Func_3d493: ; 3d493 (f:5493) ld d, h ld e, l pop hl - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 dec a ld c, a ld b, $0 @@ -62461,7 +62461,7 @@ Func_3d493: ; 3d493 (f:5493) ld [de], a ret asm_3d4ad: ; 3d4ad (f:54ad) - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld [$cc35], a jp MoveSelectionMenu @@ -62479,7 +62479,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6) swap a and $f ld b, a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp b jr nz, .asm_3d4df FuncCoord 1, 10 ; $c469 @@ -62488,25 +62488,25 @@ Func_3d4b6: ; 3d4b6 (f:54b6) call PlaceString jr .asm_3d54e .asm_3d4df - ld hl, W_CURMENUITEMID ; $cc26 + ld hl, wCurrentMenuItem ; $cc26 dec [hl] xor a ld [H_WHOSETURN], a ; $FF00+$f3 ld hl, W_PLAYERMONMOVES - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld c, a ld b, $0 add hl, bc ld a, [hl] - ld [W_PLAYERSELECTEDMOVE], a ; $ccdc - ld a, [W_PLAYERMONNUMBER] ; $cc2f - ld [W_WHICHPOKEMON], a ; $cf92 + ld [wPlayerSelectedMove], a ; $ccdc + ld a, [wPlayerMonNumber] ; $cc2f + ld [wWhichPokemon], a ; $cf92 ld a, $4 ld [$cc49], a ld hl, GetMaxPP ld b, BANK(GetMaxPP) call Bankswitch ; indirect jump to GetMaxPP (e677 (3:6677)) - ld hl, W_CURMENUITEMID ; $cc26 + ld hl, wCurrentMenuItem ; $cc26 ld c, [hl] inc [hl] ld b, $0 @@ -62627,7 +62627,7 @@ SelectEnemyMove: ; 3d564 (f:5564) .moveChosen ld a, b dec a - ld [W_ENEMYMOVELISTINDEX], a + ld [wEnemyMoveListIndex], a ld a, [W_ENEMYDISABLEDMOVE] swap a and $f @@ -62638,7 +62638,7 @@ SelectEnemyMove: ; 3d564 (f:5564) and a jr z, .chooseRandomMove ; move non-existant, try again .done - ld [W_ENEMYSELECTEDMOVE], a + ld [wEnemySelectedMove], a ret .asm_3d601 ld a, $a5 @@ -62647,23 +62647,23 @@ SelectEnemyMove: ; 3d564 (f:5564) Func_3d605: ; 3d605 (f:5605) ld a, $ff ld [$cc3e], a - ld a, [W_PLAYERMOVELISTINDEX] ; $cc2e + ld a, [wPlayerMoveListIndex] ; $cc2e cp $f jr z, .asm_3d630 ld a, [$cd6a] and a jr nz, .asm_3d629 - ld a, [W_PLAYERSELECTEDMOVE] ; $ccdc + ld a, [wPlayerSelectedMove] ; $ccdc cp $a5 ld b, $e jr z, .asm_3d62f dec b inc a jr z, .asm_3d62f - ld a, [W_PLAYERMOVELISTINDEX] ; $cc2e + ld a, [wPlayerMoveListIndex] ; $cc2e jr .asm_3d630 .asm_3d629 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 add $4 ld b, a .asm_3d62f @@ -62696,7 +62696,7 @@ Func_3d605: ; 3d605 (f:5605) Func_3d65e: ; 3d65e (f:565e) xor a ld [H_WHOSETURN], a ; $FF00+$f3 - ld a, [W_PLAYERSELECTEDMOVE] ; $ccdc + ld a, [wPlayerSelectedMove] ; $ccdc inc a jp z, Function580A xor a @@ -63250,7 +63250,7 @@ CantMoveText: ; 3da83 (f:5a83) db "@" Func_3da88: ; 3da88 (f:5a88) - ld hl, W_PLAYERSELECTEDMOVE ; $ccdc + ld hl, wPlayerSelectedMove ; $ccdc ld de, W_PLAYERBATTSTATUS1 ; $d062 ld a, [H_WHOSETURN] ; $FF00+$f3 and a @@ -63543,13 +63543,13 @@ Func_3dc88: ; 3dc88 (f:5c88) .asm_3dc97 ld hl, W_PARTYMON1_OTID ; $d177 ld bc, $2c - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f call AddNTimes - ld a, [W_PLAYERIDHI] ; $d359 + ld a, [wPlayerID] ; $d359 cp [hl] jr nz, .asm_3dcb1 inc hl - ld a, [W_PLAYERIDLO] ; $d35a + ld a, [wPlayerID + 1] ; $d35a cp [hl] jp z, Func_3ddb0 .asm_3dcb1 @@ -63638,7 +63638,7 @@ Func_3dc88: ; 3dc88 (f:5c88) ld a, [$ccee] and a jr nz, .asm_3dd20 - ld a, [W_PLAYERSELECTEDMOVE] ; $ccdc + ld a, [wPlayerSelectedMove] ; $ccdc cp $a5 jr z, .asm_3dd20 ld hl, W_PLAYERMONPP ; $d02d @@ -63659,7 +63659,7 @@ Func_3dc88: ; 3dc88 (f:5c88) add b pop hl push af - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld c, a ld b, $0 add hl, bc @@ -63671,9 +63671,9 @@ Func_3dc88: ; 3dc88 (f:5c88) jr z, .asm_3dd20 ld a, $1 ld [$cced], a - ld a, [W_MAXMENUITEMID] ; $cc28 + ld a, [wMaxMenuItem] ; $cc28 ld b, a - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld c, a .asm_3dd86 call GenRandomInBattle @@ -63682,7 +63682,7 @@ Func_3dc88: ; 3dc88 (f:5c88) jr nc, .asm_3dd86 cp c jr z, .asm_3dd86 - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld hl, W_PLAYERMONPP ; $d02d ld e, a ld d, $0 @@ -63690,13 +63690,13 @@ Func_3dc88: ; 3dc88 (f:5c88) ld a, [hl] and a jr z, .asm_3dd86 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld c, a ld b, $0 ld hl, W_PLAYERMONMOVES add hl, bc ld a, [hl] - ld [W_PLAYERSELECTEDMOVE], a ; $ccdc + ld [wPlayerSelectedMove], a ; $ccdc call GetCurrentMove Func_3ddb0: ; 3ddb0 (f:5db0) @@ -63765,7 +63765,7 @@ CalculateDamage: ; 3ddcf (f:5dcf) ld c, a push bc ld hl, $d18f - ld a, [W_PLAYERMONNUMBER] + ld a, [wPlayerMonNumber] ld bc, $002c call AddNTimes pop bc @@ -63795,7 +63795,7 @@ CalculateDamage: ; 3ddcf (f:5dcf) ld c, a push bc ld hl, $d195 - ld a, [W_PLAYERMONNUMBER] + ld a, [wPlayerMonNumber] ld bc, $002c call AddNTimes pop bc @@ -63858,7 +63858,7 @@ Func_3de75: ; 3de75 (f:5e75) and a jr z, .asm_3deef ld hl, W_PARTYMON1_DEFENSE ; $d191 - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f ld bc, $2c call AddNTimes ld a, [hli] @@ -63886,7 +63886,7 @@ Func_3de75: ; 3de75 (f:5e75) and a jr z, .asm_3deef ld hl, W_PARTYMON1_SPECIAL ; $d195 - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f ld bc, $2c call AddNTimes ld a, [hli] @@ -64182,14 +64182,14 @@ HandleCounterMove: ; 3e093 (f:6093) ld a,[H_WHOSETURN] ; whose turn and a ; player's turn - ld hl,W_ENEMYSELECTEDMOVE + ld hl,wEnemySelectedMove ld de,W_ENEMYMOVEPOWER - ld a,[W_PLAYERSELECTEDMOVE] + ld a,[wPlayerSelectedMove] jr z,.next ; enemy's turn - ld hl,W_PLAYERSELECTEDMOVE + ld hl,wPlayerSelectedMove ld de,W_PLAYERMOVEPOWER - ld a,[W_ENEMYSELECTEDMOVE] + ld a,[wEnemySelectedMove] .next cp a,COUNTER ret nz ; return if not using Counter @@ -64312,25 +64312,25 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142) bit 4,a ; does the enemy have a substitute? jp nz,AttackSubstitute ; subtract the damage from the pokemon's current HP -; also, save the current HP at W_HPBAROLDHP +; also, save the current HP at wHPBarOldHP ld a,[hld] ld b,a ld a,[W_ENEMYMONCURHP + 1] - ld [W_HPBAROLDHP],a + ld [wHPBarOldHP],a sub b ld [W_ENEMYMONCURHP + 1],a ld a,[hl] ld b,a ld a,[W_ENEMYMONCURHP] - ld [W_HPBAROLDHP+1],a + ld [wHPBarOldHP+1],a sbc b ld [W_ENEMYMONCURHP],a jr nc,.animateHpBar ; if more damage was done than the current HP, zero the HP and set the damage ; equal to how much HP the pokemon had before the attack - ld a,[W_HPBAROLDHP+1] + ld a,[wHPBarOldHP+1] ld [hli],a - ld a,[W_HPBAROLDHP] + ld a,[wHPBarOldHP] ld [hl],a xor a ld hl,W_ENEMYMONCURHP @@ -64339,14 +64339,14 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142) .animateHpBar ld hl,W_ENEMYMONMAXHP ld a,[hli] - ld [W_HPBARMAXHP+1],a + ld [wHPBarMaxHP+1],a ld a,[hl] - ld [W_HPBARMAXHP],a + ld [wHPBarMaxHP],a ld hl,W_ENEMYMONCURHP ld a,[hli] - ld [W_HPBARNEWHP+1],a + ld [wHPBarNewHP+1],a ld a,[hl] - ld [W_HPBARNEWHP],a + ld [wHPBarNewHP],a FuncCoord 2, 2 ; $c3ca ld hl,Coord xor a @@ -64433,40 +64433,40 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200) bit 4,a ; does the player have a substitute? jp nz,AttackSubstitute ; subtract the damage from the pokemon's current HP -; also, save the current HP at W_HPBAROLDHP and the new HP at W_HPBARNEWHP +; also, save the current HP at wHPBarOldHP and the new HP at wHPBarNewHP ld a,[hld] ld b,a ld a,[W_PLAYERMONCURHP + 1] - ld [W_HPBAROLDHP],a + ld [wHPBarOldHP],a sub b ld [W_PLAYERMONCURHP + 1],a - ld [W_HPBARNEWHP],a + ld [wHPBarNewHP],a ld b,[hl] ld a,[W_PLAYERMONCURHP] - ld [W_HPBAROLDHP+1],a + ld [wHPBarOldHP+1],a sbc b ld [W_PLAYERMONCURHP],a - ld [W_HPBARNEWHP+1],a + ld [wHPBarNewHP+1],a jr nc,.animateHpBar ; if more damage was done than the current HP, zero the HP and set the damage ; equal to how much HP the pokemon had before the attack - ld a,[W_HPBAROLDHP+1] + ld a,[wHPBarOldHP+1] ld [hli],a - ld a,[W_HPBAROLDHP] + ld a,[wHPBarOldHP] ld [hl],a xor a ld hl,W_PLAYERMONCURHP ld [hli],a ld [hl],a - ld hl,W_HPBARNEWHP + ld hl,wHPBarNewHP ld [hli],a ld [hl],a .animateHpBar ld hl,W_PLAYERMONMAXHP ld a,[hli] - ld [W_HPBARMAXHP+1],a + ld [wHPBarMaxHP+1],a ld a,[hl] - ld [W_HPBARMAXHP],a + ld [wHPBarMaxHP],a FuncCoord 10, 9 ; $c45e ld hl,Coord ld a,$01 @@ -64480,13 +64480,13 @@ AttackSubstitute: ; 3e25e (f:625e) ld hl,SubstituteTookDamageText call PrintText ; values for player turn - ld de,W_ENEMYSUBSITUTEHP + ld de,wEnemySubstituteHP ld bc,W_ENEMYBATTSTATUS2 ld a,[H_WHOSETURN] and a jr z,.applyDamageToSubstitute ; values for enemy turn - ld de,W_PLAYERSUBSITUTEHP + ld de,wPlayerSubstituteHP ld bc,W_PLAYERBATTSTATUS2 .applyDamageToSubstitute ld hl,W_DAMAGE @@ -64536,14 +64536,14 @@ SubstituteBrokeText: ; 3e2b1 (f:62b1) HandleBuildingRage: ; 3e2b6 (f:62b6) ; values for the player turn ld hl,W_ENEMYBATTSTATUS2 - ld de,W_ENEMYMONATTACKMOD + ld de,wEnemyMonStatMods ld bc,W_ENEMYMOVENUM ld a,[H_WHOSETURN] and a jr z,.next ; values for the enemy turn ld hl,W_PLAYERBATTSTATUS2 - ld de,W_PLAYERMONATTACKMOD + ld de,wPlayerMonStatMods ld bc,W_PLAYERMOVENUM .next bit 6,[hl] ; is the pokemon being attacked under the effect of Rage? @@ -64586,13 +64586,13 @@ MirrorMoveCopyMove: ; 3e2fd (f:62fd) and a ; values for player turn ld a,[$ccf2] - ld hl,W_PLAYERSELECTEDMOVE + ld hl,wPlayerSelectedMove ld de,W_PLAYERMOVENUM jr z,.next ; values for enemy turn ld a,[$ccf1] ld de,W_ENEMYMOVENUM - ld hl,W_ENEMYSELECTEDMOVE + ld hl,wEnemySelectedMove .next ld [hl],a cp a,MIRROR_MOVE ; did the target pokemon also use Mirror Move? @@ -64635,13 +64635,13 @@ MetronomePickMove: ; 3e348 (f:6348) call PlayMoveAnimation ; play Metronome's animation ; values for player turn ld de,W_PLAYERMOVENUM - ld hl,W_PLAYERSELECTEDMOVE + ld hl,wPlayerSelectedMove ld a,[H_WHOSETURN] and a jr z,.pickMoveLoop ; values for enemy turn ld de,W_ENEMYMOVENUM - ld hl,W_ENEMYSELECTEDMOVE + ld hl,wEnemySelectedMove ; loop to pick a random number in the range [1, $a5) to be the move used by Metronome .pickMoveLoop call GenRandomInBattle ; random number @@ -64663,12 +64663,12 @@ IncrementMovePP: ; 3e373 (f:6373) ; values for player turn ld hl,W_PLAYERMONPP ld de,W_PARTYMON1_MOVE1PP - ld a,[W_PLAYERMOVELISTINDEX] + ld a,[wPlayerMoveListIndex] jr z,.next ; values for enemy turn ld hl,W_ENEMYMONPP ld de,$d8c1 ; enemy party pokemon 1 PP - ld a,[W_ENEMYMOVELISTINDEX] + ld a,[wEnemyMoveListIndex] .next ld b,$00 ld c,a @@ -64679,7 +64679,7 @@ IncrementMovePP: ; 3e373 (f:6373) add hl,bc ld a,[H_WHOSETURN] and a - ld a,[W_PLAYERMONNUMBER] ; value for player turn + ld a,[wPlayerMonNumber] ; value for player turn jr z,.next2 ld a,[W_ENEMYMONNUMBER] ; value for enemy turn .next2 @@ -65055,16 +65055,16 @@ CalcHitChance: ; 3e624 (f:6624) ld hl,W_PLAYERMOVEACCURACY ld a,[H_WHOSETURN] and a - ld a,[W_PLAYERMONACCURACYMOD] + ld a,[wPlayerMonAccuracyMod] ld b,a - ld a,[W_ENEMYMONEVASIONMOD] + ld a,[wEnemyMonEvasionMod] ld c,a jr z,.next ; values for enemy turn ld hl,W_ENEMYMOVEACCURACY - ld a,[W_ENEMYMONACCURACYMOD] + ld a,[wEnemyMonAccuracyMod] ld b,a - ld a,[W_PLAYERMONEVASIONMOD] + ld a,[wPlayerMonEvasionMod] ld c,a .next ld a,$0e @@ -65154,7 +65154,7 @@ Func_3e687: ; 3e687 (f:6687) ret Func_3e6bc: ; 3e6bc (f:66bc) - ld a, [W_ENEMYSELECTEDMOVE] ; $ccdd + ld a, [wEnemySelectedMove] ; $ccdd inc a jp z, Func_3e88c call Function5811 @@ -65518,7 +65518,7 @@ Func_3e9aa: ; 3e9aa (f:69aa) ld a, [$ccef] and a jr z, .asm_3e9bf - ld hl, W_ENEMYSELECTEDMOVE ; $ccdd + ld hl, wEnemySelectedMove ; $ccdd cp [hl] jr nz, .asm_3e9bf call Func_3da88 @@ -65662,7 +65662,7 @@ GetCurrentMove: ; 3eabe (f:6abe) and a jp z, .player ld de, W_ENEMYMOVENUM ; $cfcc - ld a, [W_ENEMYSELECTEDMOVE] ; $ccdd + ld a, [wEnemySelectedMove] ; $ccdd jr .selected .player ld de, W_PLAYERMOVENUM ; $cfd2 @@ -65670,7 +65670,7 @@ GetCurrentMove: ; 3eabe (f:6abe) bit 0, a ld a, [$ccd9] jr nz, .selected - ld a, [W_PLAYERSELECTEDMOVE] ; $ccdc + ld a, [wPlayerSelectedMove] ; $ccdc .selected ld [$d0b5], a dec a @@ -65738,14 +65738,14 @@ Func_3eb01: ; 3eb01 (f:6b01) jr .asm_3eb86 .asm_3eb65 ld hl, W_ENEMYMON1HP ; $d8a5 (aliases: W_WATERMONS) - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld bc, $2c call AddNTimes ld a, [hli] ld [W_ENEMYMONCURHP], a ; $cfe6 ld a, [hli] ld [$cfe7], a - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld [W_ENEMYMONNUMBER], a ; $cfe8 inc hl ld a, [hl] @@ -65767,7 +65767,7 @@ Func_3eb01: ; 3eb01 (f:6b01) cp $2 jr nz, .asm_3ebb0 ld hl, $d8ac - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld bc, $2c call AddNTimes ld bc, $4 @@ -65828,7 +65828,7 @@ Func_3eb01: ; 3eb01 (f:6b01) dec a ld c, a ld b, $1 - ld hl, W_SEENPOKEMON ; $d30a + ld hl, wPokedexSeen ; $d30a ld a, $10 call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) ld hl, W_ENEMYMONLEVEL ; $cff3 @@ -65837,7 +65837,7 @@ Func_3eb01: ; 3eb01 (f:6b01) call CopyData ld a, $7 ld b, $8 - ld hl, W_ENEMYMONATTACKMOD ; $cd2e + ld hl, wEnemyMonStatMods ; $cd2e .asm_3ec2d ld [hli], a dec b @@ -65849,7 +65849,7 @@ Func_3ec32: ; 3ec32 (f:6c32) cp $4 jr nz, .asm_3ec4d xor a - ld [W_MENUJOYPADPOLLCOUNT], a ; $cc34 + ld [wMenuJoypadPollCount], a ; $cc34 ld hl, Func_372d6 ld b, BANK(Func_372d6) call Bankswitch ; indirect jump to Func_372d6 (372d6 (d:72d6)) @@ -65905,7 +65905,7 @@ Func_3ec92: ; 3ec92 (f:6c92) call UncompressSpriteFromDE ld a, $3 call Predef ; indirect jump to ScaleSpriteByTwo (2fe40 (b:7e40)) - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer xor a ld [H_DOWNARROWBLINKCNT1], a ; $FF00+$8b ld b, $7 @@ -66079,11 +66079,11 @@ Func_3eda5: ; 3eda5 (f:6da5) ld a, c ld hl, W_PLAYERMONATK ld de, $cd12 - ld bc, W_PLAYERMONATTACKMOD ; $cd1a + ld bc, wPlayerMonAttackMod ; $cd1a jr z, .asm_3edc0 ld hl, W_ENEMYMONATTACK ld de, $cd26 - ld bc, W_ENEMYMONATTACKMOD ; $cd2e + ld bc, wEnemyMonStatMods ; $cd2e .asm_3edc0 add c ld c, a @@ -66355,7 +66355,7 @@ asm_3ef3d: ; 3ef3d (f:6f3d) ld [W_ENEMYMONID], a ld [$FF00+$e1], a dec a - ld [W_AICOUNT], a ; $ccdf + ld [wAICount], a ; $ccdf FuncCoord 12, 0 ; $c3ac ld hl, Coord ld a, $1 @@ -66927,7 +66927,7 @@ CheckDefrost: ; 3f3e2 (f:73e2) ret nz ld [W_PLAYERMONSTATUS], a ld hl, $d16f - ld a, [W_PLAYERMONNUMBER] + ld a, [wPlayerMonNumber] ld bc, $002c call AddNTimes xor a @@ -66941,12 +66941,12 @@ UnnamedText_3f423: ; 3f423 (f:7423) db "@" Func_3f428: ; 3f428 (f:7428) - ld hl, W_PLAYERMONATTACKMOD ; $cd1a + ld hl, wPlayerMonStatMods ; $cd1a ld de, W_PLAYERMOVEEFFECT ; $cfd3 ld a, [H_WHOSETURN] ; $FF00+$f3 and a jr z, .asm_3f439 - ld hl, W_ENEMYMONATTACKMOD ; $cd2e + ld hl, wEnemyMonStatMods ; $cd2e ld de, W_ENEMYMOVEEFFECT ; $cfcd .asm_3f439 ld a, [de] @@ -67118,13 +67118,13 @@ UnnamedText_3f547: ; 3f547 (f:7547) TX_FAR _UnnamedText_3f547 db "@" - ld hl, W_ENEMYMONATTACKMOD ; $cd2e + ld hl, wEnemyMonStatMods ; $cd2e ld de, W_PLAYERMOVEEFFECT ; $cfd3 ld bc, W_ENEMYBATTSTATUS1 ; $d067 ld a, [H_WHOSETURN] ; $FF00+$f3 and a jr z, .asm_3f572 - ld hl, W_PLAYERMONATTACKMOD ; $cd1a + ld hl, wPlayerMonStatMods ; $cd1a ld de, W_ENEMYMOVEEFFECT ; $cfcd ld bc, W_PLAYERBATTSTATUS1 ; $d062 ld a, [W_ISLINKBATTLE] ; $d12b @@ -67565,13 +67565,13 @@ UnnamedText_3f80c: ; 3f80c (f:780c) ld a, b call Func_3fbb9 ld a, [de] - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d ld hl, Unknown_3f8c8 ; $78c8 jp PrintText Unknown_3f8c8: ; 3f8c8 (f:78c8) INCBIN "baserom.gbc",$3f8c8,$3f8cd - $3f8c8 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $d ld hl, UnnamedText_3f8f9 ; $78f9 jr z, .asm_3f8f8 @@ -67931,12 +67931,12 @@ DisplayPokedexMenu_: ; 40000 (10:4000) call GBPalWhiteOut call ClearScreen call UpdateSprites ; move sprites - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] push af xor a - ld [W_CURMENUITEMID],a - ld [W_LISTSCROLLOFFSET],a - ld [W_OLDMENUITEMID],a + ld [wCurrentMenuItem],a + ld [wListScrollOffset],a + ld [wLastMenuItem],a inc a ld [$d11e],a ld [$ffb7],a @@ -67947,7 +67947,7 @@ DisplayPokedexMenu_: ; 40000 (10:4000) ld b,BANK(LoadPokedexTilePatterns) call Bankswitch .doPokemonListMenu - ld hl,W_TOPMENUITEMY + ld hl,wTopMenuItemY ld a,3 ld [hli],a ; top menu item Y xor a @@ -67964,13 +67964,13 @@ DisplayPokedexMenu_: ; 40000 (10:4000) .exitPokedex xor a ld [$cc37],a - ld [W_CURMENUITEMID],a - ld [W_OLDMENUITEMID],a + ld [wCurrentMenuItem],a + ld [wLastMenuItem],a ld [$ffb7],a ld [$cd3a],a ld [$cd3b],a pop af - ld [W_LISTSCROLLOFFSET],a + ld [wListScrollOffset],a call GBPalWhiteOutWithDelay3 call GoPAL_SET_CF1C jp ReloadMapData @@ -67990,12 +67990,12 @@ DisplayPokedexMenu_: ; 40000 (10:4000) ; 02: the pokemon has not been seen yet or the player pressed the B button HandlePokedexSideMenu: ; 4006d (10:406d) call PlaceUnfilledArrowMenuCursor - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] push af ld b,a - ld a,[W_OLDMENUITEMID] + ld a,[wLastMenuItem] push af - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] push af add b inc a @@ -68004,12 +68004,12 @@ HandlePokedexSideMenu: ; 4006d (10:406d) push af ld a,[$cd3d] push af - ld hl,W_SEENPOKEMON + ld hl,wPokedexSeen call IsPokemonBitSet ld b,2 jr z,.exitSideMenu call PokedexToIndex - ld hl,W_TOPMENUITEMY + ld hl,wTopMenuItemY ld a,10 ld [hli],a ; top menu item Y ld a,15 @@ -68028,7 +68028,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) bit 1,a ; was the B button pressed? ld b,2 jr nz,.buttonBPressed - ld a,[W_CURMENUITEMID] + ld a,[wCurrentMenuItem] and a jr z,.choseData dec a @@ -68043,11 +68043,11 @@ HandlePokedexSideMenu: ; 4006d (10:406d) pop af ld [$d11e],a pop af - ld [W_LISTSCROLLOFFSET],a + ld [wListScrollOffset],a pop af - ld [W_OLDMENUITEMID],a + ld [wLastMenuItem],a pop af - ld [W_CURMENUITEMID],a + ld [wCurrentMenuItem],a push bc FuncCoord 0,3 ld hl,Coord @@ -68104,7 +68104,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) FuncCoord 14,9 ld hl,Coord call DrawPokedexVerticalLine - ld hl,W_SEENPOKEMON + ld hl,wPokedexSeen ld b,19 call CountSetBits ld de,$d11e @@ -68112,7 +68112,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) ld hl,Coord ld bc,$0103 call PrintNumber ; print number of seen pokemon - ld hl,W_OWNEDPOKEMON + ld hl,wPokedexOwned ld b,19 call CountSetBits ld de,$d11e @@ -68137,7 +68137,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) ld de,PokedexMenuItemsText call PlaceString ; find the highest pokedex number among the pokemon the player has seen - ld hl,W_SEENPOKEMON + 18 + ld hl,wPokedexSeen + 18 ld b,153 .maxSeenPokemonLoop ld a,[hld] @@ -68161,7 +68161,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) call ClearScreenArea FuncCoord 1,3 ld hl,Coord - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] ld [$d11e],a ld d,7 ld a,[$cd3d] @@ -68169,7 +68169,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) jr nc,.printPokemonLoop ld d,a dec a - ld [W_MAXMENUITEMID],a + ld [wMaxMenuItem],a ; loop to print pokemon pokedex numbers and names ; if the player has owned the pokemon, it puts a pokeball beside the name .printPokemonLoop @@ -68188,7 +68188,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) add hl,de dec hl push hl - ld hl,W_OWNEDPOKEMON + ld hl,wPokedexOwned call IsPokemonBitSet pop hl ld a," " @@ -68197,7 +68197,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) .writeTile ld [hl],a ; put a pokeball next to pokemon that the player has owned push hl - ld hl,W_SEENPOKEMON + ld hl,wPokedexSeen call IsPokemonBitSet jr nz,.getPokemonName ; if the player has seen the pokemon ld de,.dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon @@ -68230,11 +68230,11 @@ HandlePokedexListMenu: ; 40111 (10:4111) bit 6,a ; was Up pressed? jr z,.checkIfDownPressed .upPressed ; scroll up one row - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] and a jp z,.loop dec a - ld [W_LISTSCROLLOFFSET],a + ld [wListScrollOffset],a jp .loop .checkIfDownPressed bit 7,a ; was Down pressed? @@ -68245,11 +68245,11 @@ HandlePokedexListMenu: ; 40111 (10:4111) jp c,.loop sub a,7 ld b,a - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] cp b jp z,.loop inc a - ld [W_LISTSCROLLOFFSET],a + ld [wListScrollOffset],a jp .loop .checkIfRightPressed bit 4,a ; was Right pressed? @@ -68260,25 +68260,25 @@ HandlePokedexListMenu: ; 40111 (10:4111) jp c,.loop sub a,6 ld b,a - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] add a,7 - ld [W_LISTSCROLLOFFSET],a + ld [wListScrollOffset],a cp b jp c,.loop dec b ld a,b - ld [W_LISTSCROLLOFFSET],a + ld [wListScrollOffset],a jp .loop .checkIfLeftPressed ; scroll up 7 rows bit 5,a ; was Left pressed? jr z,.buttonAPressed .leftPressed - ld a,[W_LISTSCROLLOFFSET] + ld a,[wListScrollOffset] sub a,7 - ld [W_LISTSCROLLOFFSET],a + ld [wListScrollOffset],a jp nc,.loop xor a - ld [W_LISTSCROLLOFFSET],a + ld [wListScrollOffset],a jp .loop .buttonAPressed scf @@ -68427,7 +68427,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld de,$d11e ld bc,$8103 call PrintNumber ; print pokedex number - ld hl,W_OWNEDPOKEMON + ld hl,wPokedexOwned call IsPokemonBitSet pop af ld [$d11e],a @@ -70057,17 +70057,17 @@ PokedexOrder: ; 41024 (10:5024) db DEX_VICTREEBEL Func_410e2: ; 410e2 (10:50e2) - ld a, [W_TRAINERSPRITEOFFSET] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [$cd5e], a - ld a, [W_TRAINERENGAGEDISTANCE] + ld a, [wTrainerEngageDistance] ld [$cd5f], a ld de, Unknown_41138 ; $5138 jr Func_41102 Func_410f3: ; 410f3 (10:50f3) - ld a, [W_TRAINERENGAGEDISTANCE] + ld a, [wTrainerEngageDistance] ld [$cd5e], a - ld a, [W_TRAINERSPRITEOFFSET] + ld a, [wTrainerSpriteOffset] ld [$cd5f], a ld de, Unknown_41149 @@ -70136,7 +70136,7 @@ Func_41191: ; 41191 (10:5191) jp DelayFrames Func_41196: ; 41196 (10:5196) - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld bc, $168 ld a, $7f jp FillMemory @@ -70171,7 +70171,7 @@ Func_41196: ; 41196 (10:5196) call EnableLCD xor a ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [$d11e], a call GetMonName ld hl, $cd6d @@ -70213,7 +70213,7 @@ INCBIN "baserom.gbc",$41217,$4123b - $41217 ld b, $98 call CopyScreenTileBufferToVRAM call ClearScreen - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d call Func_415a4 ld a, $7e .asm_41273 @@ -70231,7 +70231,7 @@ INCBIN "baserom.gbc",$41217,$4123b - $41217 call Func_41676 ld a, $aa call Func_41676 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d call PlayCry xor a ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba @@ -70568,7 +70568,7 @@ Func_41505: ; 41505 (10:5505) call Func_41558 Func_41510: ; 41510 (10:5510) - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld c, $14 .asm_41515 ld a, [W_BASECOORDY] ; $d082 @@ -70929,7 +70929,7 @@ AnimateIntroNidorino: ; 41793 (10:5793) jr AnimateIntroNidorino Func_417ae: ; 417ae (10:57ae) - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld a, [$d09f] ld d, a .asm_417b5 @@ -70948,7 +70948,7 @@ Func_417ae: ; 417ae (10:57ae) ret Func_417c7: ; 417c7 (10:57c7) - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld d, $0 .asm_417cc push bc @@ -71112,7 +71112,7 @@ Func_4188a: ; 4188a (10:588a) Func_418e9: ; 418e9 (10:58e9) call Func_417f0 - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld c, $50 call Func_41807 FuncCoord 0, 14 ; $c4b8 @@ -71368,12 +71368,12 @@ LavenderTownText9: ; 44164 (11:4164) db "@" DisplayDexRating: ; 44169 (11:4169) - ld hl, W_SEENPOKEMON + ld hl, wPokedexSeen ld b, $13 call CountSetBits ld a, [$D11E] ; result of CountSetBits (seen count) ld [$FFDB], a - ld hl, W_OWNEDPOKEMON + ld hl, wPokedexOwned ld b, $13 call CountSetBits ld a, [$D11E] ; result of CountSetBits (own count) @@ -72032,7 +72032,7 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) call EnableAutoTextBoxDrawing ld hl, $d7e7 set 0, [hl] - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] jr z, .asm_4483b ; 0x447f8 $41 @@ -72186,14 +72186,14 @@ VictoryRoad3ScriptPointers: ; 449b1 (11:49b1) dw EndTrainerBattle VictoryRoad3Script0: ; 449b7 (11:49b7) - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] jp z, .asm_449fe ld hl, .coordsData_449f9 ; $49f9 call CheckBoulderCoords jp nc, .asm_449fe - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $1 jr nz, .asm_449dc ld hl, $d126 @@ -72225,7 +72225,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld [$d71d], a ld hl, .coordsData_449f9 ; $49f9 call Func_46981 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $1 jr nz, .asm_44a1b ld hl, $d72d @@ -72665,7 +72665,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42) ld a, $a7 call PlaySound ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $3 ld [W_CURMAPSCRIPT], a ret @@ -72947,7 +72947,7 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2) and a jr nz, Func_44fd7 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d736 res 7, [hl] ld a, $0 @@ -73199,7 +73199,7 @@ RocketHideout3Script0: ; 45240 (11:5240) ld a, $a7 call PlaySound ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $3 ld [W_CURMAPSCRIPT], a ret @@ -73311,7 +73311,7 @@ RocketHideout3Script3 ; 452e4 (11:452e4) and a jp nz, Func_44fd7 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d736 res 7, [hl] ld a, $0 @@ -73452,7 +73452,7 @@ Func_45473: ; 45473 (11:5473) Func_454a3: ; 454a3 (11:54a3) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_ROCKETHIDEOUT4CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -73469,7 +73469,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6) jp z, Func_454a3 call UpdateSprites ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d81b set 7, [hl] ld a, $a @@ -73487,7 +73487,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6) call UpdateSprites call GBFadeOut1 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d126 set 5, [hl] ld a, $0 @@ -74656,7 +74656,7 @@ SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159) SeafoamIslands2Script: ; 46315 (11:6315) call EnableAutoTextBoxDrawing - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] jr z, .asm_46362 ; 0x4631f $41 @@ -74743,7 +74743,7 @@ SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160) SeafoamIslands3Script: ; 46451 (11:6451) call EnableAutoTextBoxDrawing - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] jr z, .asm_4649e ; 0x4645b $41 @@ -74830,7 +74830,7 @@ SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161) SeafoamIslands4Script: ; 4658d (11:658d) call EnableAutoTextBoxDrawing - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] jr z, .asm_465dc ; 0x46597 $43 @@ -74994,7 +74994,7 @@ SeafoamIslands5Script: ; 46799 (11:6799) SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) xor a ld [W_SEAFOAMISLANDS5CURSCRIPT], a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ret SeafoamIslands5ScriptPointers: ; 467ad (11:67ad) @@ -75053,7 +75053,7 @@ SeafoamIslands5Script1: ; 46807 (11:6807) and a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_SEAFOAMISLANDS5CURSCRIPT], a ret @@ -75199,7 +75199,7 @@ Func_46981: ; 46981 (11:6981) ret nz call ArePlayerCoordsInArray ret nc - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [$d71e], a ld hl, $d72d set 4, [hl] @@ -75234,7 +75234,7 @@ Func_469a0: ; 469a0 (11:69a0) ld h, [hl] ld l, a push hl - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d xor a ld [hli], a ld [hli], a @@ -75264,7 +75264,7 @@ Func_469a0: ; 469a0 (11:69a0) jr .asm_469ce .asm_469f0 ld a, [hli] - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d ld a, [hli] ld [$cd3e], a ld a, [hli] @@ -76611,16 +76611,16 @@ Func_4840c: ; 4840c (12:440c) ld hl, UnnamedText_484ee ; $44ee call PrintText xor a - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld a, $3 - ld [W_MENUWATCHEDKEYS], a ; $cc29 + ld [wMenuWatchedKeys], a ; $cc29 ld a, [$cd37] dec a - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 ld a, $2 - ld [W_TOPMENUITEMY], a ; $cc24 + ld [wTopMenuItemY], a ; $cc24 ld a, $1 - ld [W_TOPMENUITEMX], a ; $cc25 + ld [wTopMenuItemX], a ; $cc25 ld a, [$cd37] dec a ld bc, $2 @@ -76629,7 +76629,7 @@ Func_4840c: ; 4840c (12:440c) dec l ld b, l ld c, $c - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap call TextBoxBorder call UpdateSprites call Func_48532 @@ -76639,7 +76639,7 @@ Func_4840c: ; 4840c (12:440c) bit 1, a ret nz ld hl, $cc5b - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld d, $0 ld e, a add hl, de @@ -77060,8 +77060,8 @@ DirectorText: ; 487b2 (12:47b2) db $08 ; asm ; check pokédex - ld hl, WPokedexOwned - ld b, WPokedexOwnedEnd-WPokedexOwned + ld hl, wPokedexOwned + ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits ld a, [$d11e] cp 150 @@ -77259,7 +77259,7 @@ Gym4LeaderName: ; 4893d (12:493d) Func_48943: ; 48943 (12:4943) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_CELADONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -77275,7 +77275,7 @@ CeladonGymScript3: ; 48956 (12:4956) cp $ff jp z, Func_48943 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Func_48963: ; 48963 (12:4963) ld a, $9 @@ -77650,7 +77650,7 @@ Func_48bec: ; 48bec (12:4bec) CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_CELADONGAMECORNERCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -77668,7 +77668,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) cp $ff jp z, CeladonGameCornerScript_48c07 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $d ld [H_SPRITEHEIGHT], a call DisplayTextID @@ -77705,7 +77705,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69) bit 0, a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $46 ld [$cc4d], a ld a, $11 @@ -78541,7 +78541,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) call GivePokemon jr nc, .asm_49359 ; 0x49324 xor a - ld [W_WHICHTRADE], a + ld [wWhichTrade], a ld [$cd3f], a ld a, $5 ld [$cd3e], a @@ -78721,7 +78721,7 @@ Route11GateUpstairsTextPointers: ; 49457 (12:5457) Route11GateUpstairsText1: ; 4945f (12:545f) db $08 ; asm xor a - ld [W_WHICHTRADE], a + ld [wWhichTrade], a ld a, $54 call Predef asm_49469: ; 49469 (12:5469) @@ -79131,7 +79131,7 @@ Route16GateMapScript1: ; 4971d (12:571d) and a ret nz ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Route16GateMapScript2: ; 49727 (12:5727) ld a, $1 @@ -79151,7 +79151,7 @@ Route16GateMapScript3: ; 49741 (12:5741) and a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d730 res 7, [hl] ld a, $0 @@ -79367,7 +79367,7 @@ Route18GateScript1: ; 498d5 (12:58d5) and a ret nz ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Route18GateScript2: ; 498df (12:58df) ld a, $1 @@ -79387,7 +79387,7 @@ Route18GateScript3: ; 498f9 (12:58f9) and a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d730 res 7, [hl] ld a, $0 @@ -79464,7 +79464,7 @@ Route18GateUpstairsTextPointers: ; 49978 (12:5978) Route18GateUpstairsText1: ; 4997e (12:597e) db $08 ; asm ld a, $5 - ld [W_WHICHTRADE], a + ld [wWhichTrade], a ld a, $54 call Predef jp TextScriptEnd @@ -79825,7 +79825,7 @@ CoordsData_49d37: ; 49d37 (12:5d37) Func_49d58: ; 49d58 (12:5d58) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_MTMOON3CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -79869,7 +79869,7 @@ MtMoon3Script3: ; 49d9a (12:5d9a) ld hl, $d7f6 set 1, [hl] xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_MTMOON3CURSCRIPT], a ld [W_CURMAPSCRIPT], a @@ -79921,7 +79921,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb) bit 0, a ret nz ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $1 ld [$cc3c], a ld a, $a @@ -79939,7 +79939,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb) ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_MTMOON3CURSCRIPT], a ld [W_CURMAPSCRIPT], a @@ -80625,7 +80625,7 @@ Func_4fe11: ; 4fe11 (13:7e11) ld a, [$d11e] dec a ld c, a - ld hl, W_OWNEDPOKEMON ; $d2f7 + ld hl, wPokedexOwned ; $d2f7 ld b, $1 ld a, $10 call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) @@ -81708,7 +81708,7 @@ Route22ScriptPointers: ; 50ebe (14:4ebe) Func_50ece: ; 50ece (14:4ece) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_ROUTE22CURSCRIPT], a Route22Script7: ; 50ed5 (14:4ed5) ret @@ -81754,7 +81754,7 @@ Route22Script0: ; 50f00 (14:4f00) xor a ld [H_CURRENTPRESSEDBUTTONS], a ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $2 ld [$d528], a ld a, [$d7eb] @@ -81812,7 +81812,7 @@ Route22Script1: ; 50f62 (14:4f62) ld [$ff00+$8c], a call Func_34a6 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $1 ld [$ff00+$8c], a call DisplayTextID @@ -81852,7 +81852,7 @@ Route22Script2: ; 50fb5 (14:4fb5) ld [$ff00+$8c], a call Func_34a6 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d7eb set 5, [hl] ld a, $1 @@ -81898,7 +81898,7 @@ Route22Script3: ; 5102a (14:502a) bit 0, a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $22 ld [$cc4d], a ld a, $11 @@ -81959,7 +81959,7 @@ Route22Script4: ; 51087 (14:5087) ld [$FF00+$8d], a call Func_34a6 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $2 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -82003,7 +82003,7 @@ Route22Script5: ; 510df (14:50df) ld [$FF00+$8d], a call Func_34a6 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d7eb set 6, [hl] ld a, $2 @@ -82049,7 +82049,7 @@ Route22Script6: ; 51151 (14:5151) bit 0, a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $23 ld [$cc4d], a ld a, $11 @@ -82205,7 +82205,7 @@ YCoordsData_51255: ; 51255 (14:5255) Func_5125d: ; 5125d (14:525d) ld hl, BadgeTextPointers ; $5276 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld c, a ld b, $0 add hl, bc @@ -82259,7 +82259,7 @@ Func_512d8: ; 512d8 (14:52d8) ld [$ccd3], a xor a ld [$c109], a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a jp Func_3486 Route23Script1: ; 512ec (14:52ec) @@ -82324,9 +82324,9 @@ Route23Text7: ; 5133d (14:533d) jp TextScriptEnd Func_51346: ; 51346 (14:5346) - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d call Func_5125d - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d inc a ld c, a ld b, $2 @@ -82345,7 +82345,7 @@ Func_51346: ; 51346 (14:5346) .asm_5136e ld hl, VictoryRoadGuardText2 ; $539e call PrintText - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld c, a ld b, $1 ld hl, $d7ed @@ -82388,7 +82388,7 @@ Route24Script: ; 513ad (14:53ad) Func_513c0: ; 513c0 (14:53c0) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_ROUTE24CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -82445,14 +82445,14 @@ Route24Script3: ; 51422 (14:5422) jp z, Func_513c0 call UpdateSprites ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d7ef set 1, [hl] ld a, $1 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_ROUTE24CURSCRIPT], a ld [W_CURMAPSCRIPT], a @@ -83074,7 +83074,7 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) call CheckBoulderCoords jp nc, CheckFightingMapTrainers ld hl, $d7ee - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $2 jr z, .asm_5180b bit 0, [hl] @@ -83475,7 +83475,7 @@ Func_51bf4: ; 51bf4 (14:5bf4) Func_51c0c: ; 51c0c (14:5c0c) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Func_51c10: ; 51c10 (14:5c10) ld [W_SILPHCO7CURSCRIPT], a @@ -83500,7 +83500,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) xor a ld [H_CURRENTPRESSEDBUTTONS], a ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $4 ld [$d528], a ld a, $ff @@ -83516,7 +83516,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call SetSpriteMovementBytesToFF ld de, MovementData_51c7d - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [$cf0d], a cp $1 jr z, .asm_51c6c @@ -83541,7 +83541,7 @@ SilphCo7Script3: ; 51c82 (14:5c82) bit 0, a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $d ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -83576,7 +83576,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) cp $ff jp z, Func_51c0c ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d82f set 0, [hl] ld a, $4 @@ -83623,7 +83623,7 @@ SilphCo7Script5: ; 51d25 (14:5d25) call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) call Func_2307 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a jp Func_51c10 SilphCo7TextPointers: ; 51d3f (14:5d3f) @@ -84186,7 +84186,7 @@ Func_5225b: ; 5225b (14:625b) ret nz call ArePlayerCoordsInArray ret nc - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [$d71e], a ld hl, $d72d set 4, [hl] @@ -84470,11 +84470,11 @@ Func_525af: ; 525af (14:65af) ld [hli], a ld [hli], a ld [hl], a - ld [W_LISTSCROLLOFFSET], a ; $cc36 + ld [wListScrollOffset], a ; $cc36 ld [$d05e], a ld [W_PLAYERMONID], a ld [W_PLAYERMONSALIVEFLAGS], a - ld [W_PLAYERMONNUMBER], a ; $cc2f + ld [wPlayerMonNumber], a ; $cc2f ld [$d078], a ld [$d35d], a ld hl, $cf1d @@ -84902,7 +84902,7 @@ PrintPrizePrice: ; 5287a (14:687a) call PlaceString FuncCoord 13,1 ld hl,Coord - ld de,W_PLAYERCOINS1 + ld de,wPlayerCoins ld c,%10000010 call PrintBCDNumber ret @@ -84982,7 +84982,7 @@ HandlePrizeChoice: ; 528c6 (14:68c6) .SubtractCoins ; 14:692C call LoadCoinsToSubtract ld hl,$FFA1 - ld de,W_PLAYERCOINS2 + ld de,wPlayerCoins + 1 ld c,$02 ; how many bytes ld a,$0C call Predef ; subtract coins (BCD daa operations) @@ -85636,7 +85636,7 @@ Func_5524f: ; 5524f (15:524f) call Func_5546c ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA) xor a - ld [W_WHICHPOKEMON], a ; $cf92 + ld [wWhichPokemon], a ; $cf92 Func_5525f: ; 5525f (15:525f) inc hl @@ -85645,7 +85645,7 @@ Func_5525f: ; 5525f (15:525f) jp z, Func_55436 push hl ld hl, W_PLAYERMONSALIVEFLAGS - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld c, a ld b, $2 ld a, $10 @@ -85702,11 +85702,11 @@ Func_5525f: ; 5525f (15:525f) add hl, de ld b, [hl] inc hl - ld a, [W_PLAYERIDHI] ; $d359 + ld a, [wPlayerID] ; $d359 cp b jr nz, .asm_552d1 ld b, [hl] - ld a, [W_PLAYERIDLO] ; $d35a + ld a, [wPlayerID + 1] ; $d35a cp b ld a, $0 jr z, .asm_552d6 @@ -85738,7 +85738,7 @@ Func_5525f: ; 5525f (15:525f) .asm_552f8 inc hl push hl - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld c, a ld b, $0 ld hl, W_PARTYMON1 ; $d164 @@ -85773,7 +85773,7 @@ Func_5525f: ; 5525f (15:525f) dec hl .asm_5532e push hl - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1NAME ; $d2b5 call GetPartyMonName ld hl, Unknown_554b2 ; $54b2 @@ -85833,9 +85833,9 @@ Func_5525f: ; 5525f (15:525f) ld a, [hl] adc b ld [hl], a - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f ld b, a - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 cp b jr nz, .asm_553f7 ld de, W_PLAYERMONCURHP ; $d015 @@ -85895,7 +85895,7 @@ Func_5525f: ; 5525f (15:525f) ld a, $1a call Predef ; indirect jump to Func_3af5b (3af5b (e:6f5b)) ld hl, $ccd3 - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 ld c, a ld b, $1 ld a, $10 @@ -85907,11 +85907,11 @@ Func_5525f: ; 5525f (15:525f) Func_55436: ; 55436 (15:5436) ld a, [W_NUMINPARTY] ; $d163 ld b, a - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 inc a cp b jr z, .asm_55450 - ld [W_WHICHPOKEMON], a ; $cf92 + ld [wWhichPokemon], a ; $cf92 ld bc, $2c ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA) call AddNTimes @@ -85920,7 +85920,7 @@ Func_55436: ; 55436 (15:5436) ld hl, W_PLAYERMONSALIVEFLAGS xor a ld [hl], a - ld a, [W_PLAYERMONNUMBER] ; $cc2f + ld a, [wPlayerMonNumber] ; $cc2f ld c, a ld b, $1 push bc @@ -88838,7 +88838,7 @@ DisplayDiploma: ; 566e2 (15:66e2) ld bc, $0010 ld a, BANK(CircleTile) call FarCopyData2 - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld bc, $1012 ld a, $27 call Predef @@ -88935,7 +88935,7 @@ DiplomaGameFreak: db "GAME FREAK@" Func_567f9: ; 567f9 (15:67f9) - ld hl, $c100 + ld hl, wSpriteStateData1 ld de, $4 ld a, [$cf13] ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c @@ -88954,7 +88954,7 @@ Func_567f9: ; 567f9 (15:67f9) ret Func_56819: ; 56819 (15:6819) - ld hl, $c100 + ld hl, wSpriteStateData1 ld de, $0004 ld a, [$cf13] ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c @@ -88973,7 +88973,7 @@ Func_56819: ; 56819 (15:6819) ret Func_5683d: ; 5683d (15:683d) - ld hl, $c100 + ld hl, wSpriteStateData1 ld de, $4 ld a, [$cf13] ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c @@ -88992,7 +88992,7 @@ Func_5683d: ; 5683d (15:683d) ret Func_5685d: ; 5685d (15:685d) - ld hl, $c100 + ld hl, wSpriteStateData1 ld de, $0004 ld a, [$cf13] ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c @@ -89013,9 +89013,9 @@ Func_5685d: ; 5685d (15:685d) TrainerWalkUpToPlayer: ; 56881 (15:6881) ld a, [$cf13] swap a - ld [W_TRAINERSPRITEOFFSET], a ; $cd3d + ld [wTrainerSpriteOffset], a ; $cd3d call ReadTrainerScreenPosition - ld a, [W_TRAINERFACINGDIR] + ld a, [wTrainerFacingDirection] and a jr z, .facingDown cp $4 @@ -89024,7 +89024,7 @@ TrainerWalkUpToPlayer: ; 56881 (15:6881) jr z, .facingLeft jr .facingRight .facingDown - ld a, [W_TRAINERSCREENYPOS] + ld a, [wTrainerScreenY] ld b, a ld a, $3c ; (fixed) player screen Y pos call CalcDifference @@ -89037,7 +89037,7 @@ TrainerWalkUpToPlayer: ; 56881 (15:6881) ld b, a ; a = direction to go to jr .writeWalkScript .facingUp - ld a, [W_TRAINERSCREENYPOS] + ld a, [wTrainerScreenY] ld b, a ld a, $3c ; (fixed) player screen Y pos call CalcDifference @@ -89050,7 +89050,7 @@ TrainerWalkUpToPlayer: ; 56881 (15:6881) ld a, $40 ; a = direction to go to jr .writeWalkScript .facingRight - ld a, [W_TRAINERSCREENXPOS] + ld a, [wTrainerScreenX] ld b, a ld a, $40 ; (fixed) player screen X pos call CalcDifference @@ -89098,22 +89098,22 @@ Func_56903: ; 56903 (15:6903) CheckEngagePlayer: ; 5690f (15:690f) push hl push de - ld a, [W_TRAINERSPRITEOFFSET] ; $cd3d + ld a, [wTrainerSpriteOffset] ; $cd3d add $2 ld d, $0 ld e, a - ld hl, $c100 + ld hl, wSpriteStateData1 add hl, de ld a, [hl] ; c1x2: sprite image index sub $ff jr nz, .spriteOnScreen ; test if sprite is on screen jp .noEngage .spriteOnScreen - ld a, [W_TRAINERSPRITEOFFSET] ; $cd3d + ld a, [wTrainerSpriteOffset] ; $cd3d add $9 ld d, $0 ld e, a - ld hl, $c100 + ld hl, wSpriteStateData1 add hl, de ld a, [hl] ; c1x9: facing direction ld [$cd3f], a @@ -89152,34 +89152,34 @@ CheckEngagePlayer: ; 5690f (15:690f) jp .noEngage .engage call CheckPlayerIsInFrontOfSprite - ld a, [W_TRAINERSPRITEOFFSET] ; $cd3d + ld a, [wTrainerSpriteOffset] ; $cd3d and a jr z, .noEngage - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 set 0, [hl] call EngageMapTrainer ld a, $ff .noEngage: ; 56988 (15:6988) - ld [W_TRAINERSPRITEOFFSET], a ; $cd3d + ld [wTrainerSpriteOffset], a ; $cd3d pop de pop hl ret ; reads trainer's Y position to $cd40 and X position to $cd41 ReadTrainerScreenPosition: ; 5698e (15:698e) - ld a, [W_TRAINERSPRITEOFFSET] ; $cd3d + ld a, [wTrainerSpriteOffset] ; $cd3d add $4 ld d, $0 ld e, a - ld hl, $c100 + ld hl, wSpriteStateData1 add hl, de ld a, [hl] ld [$cd40], a - ld a, [W_TRAINERSPRITEOFFSET] ; $cd3d + ld a, [wTrainerSpriteOffset] ; $cd3d add $6 ld d, $0 ld e, a - ld hl, $c100 + ld hl, wSpriteStateData1 add hl, de ld a, [hl] ld [$cd41], a @@ -89190,7 +89190,7 @@ ReadTrainerScreenPosition: ; 5698e (15:698e) ; a: distance player to sprite CheckSpriteCanSeePlayer: ; 569af (15:69af) ld b, a - ld a, [W_TRAINERENGAGEDISTANCE] ; sprite line of sight (engage distance) + ld a, [wTrainerEngageDistance] ; sprite line of sight (engage distance) cp b jr nc, .checkIfLinedUp jr .notInLine ; player too far away @@ -89228,11 +89228,11 @@ CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3) ld a, [W_CURMAP] ; $d35e cp POWER_PLANT jp z, .engage ; XXX not sure why bypass this for power plant (maybe to get voltorb fake items to work?) - ld a, [W_TRAINERSPRITEOFFSET] ; $cd3d + ld a, [wTrainerSpriteOffset] ; $cd3d add $4 ld d, $0 ld e, a - ld hl, $c100 + ld hl, wSpriteStateData1 add hl, de ld a, [hl] ; c1x4 (sprite screen Y pos) cp $fc @@ -89240,11 +89240,11 @@ CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3) ld a, $c .notOnTopmostTile ld [$cd40], a - ld a, [W_TRAINERSPRITEOFFSET] ; $cd3d + ld a, [wTrainerSpriteOffset] ; $cd3d add $6 ld d, $0 ld e, a - ld hl, $c100 + ld hl, wSpriteStateData1 add hl, de ld a, [hl] ; c1x6 (sprite screen X pos) ld [$cd41], a @@ -89279,7 +89279,7 @@ CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3) .noEngage xor a .done - ld [W_TRAINERSPRITEOFFSET], a ; $cd3d + ld [wTrainerSpriteOffset], a ; $cd3d ret SECTION "bank16",ROMX,BANK[$16] @@ -91153,7 +91153,7 @@ Route12Script: ; 595f3 (16:55f3) Route12Script_59606: ; 59606 (16:5606) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_ROUTE12CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -91745,7 +91745,7 @@ Route16Script: ; 59933 (16:5933) Func_59946: ; 59946 (16:5946) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_ROUTE16CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -93032,7 +93032,7 @@ LanceScript0: ; 5a305 (16:6305) jp nc, CheckFightingMapTrainers xor a ld [H_CURRENTPRESSEDBUTTONS], a - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $3 jr nc, .asm_5a325 ld a, $1 @@ -93065,7 +93065,7 @@ LanceScript2: ; 5a349 (16:6349) Func_5a35b: ; 5a35b (16:635b) ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $ccd3 ld de, RLEList_5a379 call DecodeRLEList @@ -93090,7 +93090,7 @@ LanceScript3: ; 5a382 (16:6382) ret nz call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_LANCECURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -93182,7 +93182,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) ld a, [$d358] push af xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $55 call Predef pop af @@ -93222,7 +93222,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) HallofFameRoomScript0: ; 5a50d (16:650d) ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $ccd3 ld de, RLEMovement5a528 call DecodeRLEList @@ -93251,14 +93251,14 @@ HallofFameRoomScript1: ; 5a52b (16:652b) call Func_34a6 call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a inc a ld [$d528], a ld a, $1 ld [$ff00+$8c], a call DisplayTextID ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $8 ld [$cc4d], a ld a, $11 @@ -93393,11 +93393,11 @@ RedsHouse2FObject: ; 0x5c0d0 ? Func_5c0dc: ; 5c0dc (17:40dc) ld a, $4b - ld [W_OWNEDPOKEMON], a ; $d2f7 + ld [wPokedexOwned], a ; $d2f7 ld a, $3d call Predef ; indirect jump to ShowPokedexData (402d1 (10:42d1)) xor a - ld [W_OWNEDPOKEMON], a ; $d2f7 + ld [wPokedexOwned], a ; $d2f7 ret MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52) @@ -93790,7 +93790,7 @@ Gym1LeaderName: ; 5c3b9 (17:43b9) Func_5c3bf: ; 5c3bf (17:43bf) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_PEWTERGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -93806,7 +93806,7 @@ PewterGymScript3: ; 5c3d2 (17:43d2) cp $ff jp z, Func_5c3bf ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Func_5c3df: ; 5c3df (17:43df) ld a, $4 @@ -94209,7 +94209,7 @@ Gym2LeaderName: ; 5c6e7 (17:46e7) Func_5c6ed: ; 5c6ed (17:46ed) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_CERULEANGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -94225,7 +94225,7 @@ CeruleanGymScript3: ; 5c700 (17:4700) cp $ff jp z, Func_5c6ed ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Func_5c70d: ; 5c70d (17:470d) ld a, $5 @@ -94728,7 +94728,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_VERMILIONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -94744,7 +94744,7 @@ VermilionGymScript3: ; 5ca9d (17:4a9d) cp $ff jp z, VermilionGymScript_5ca8a ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Func_5caaa: ; 5caaa (17:4aaa) ld a, $6 @@ -95145,7 +95145,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83) bit 0, a ret nz call CheckFightingMapTrainers - ld a, [W_TRAINERHEADERFLAGBIT] + ld a, [wTrainerHeaderFlagBit] and a ret nz ld a, [$d7b1] @@ -95515,7 +95515,7 @@ Gym6LeaderName: ; 5d040 (17:5040) Func_5d048: ; 5d048 (17:5048) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_SAFFRONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -95531,7 +95531,7 @@ SaffronGymScript3: ; 5d05b (17:505b) cp $ff jp z, Func_5d048 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Func_5d068: ; 5d068 (17:5068) ld a, $a @@ -96270,7 +96270,7 @@ UndergroundTunnelEntranceRoute5TextPointers: ; 5d6b0 (17:56b0) UndergroundTunnelEntranceRoute5Text1: ; 5d6b2 (17:56b2) db $08 ; asm ld a, $9 - ld [W_WHICHTRADE], a + ld [wWhichTrade], a ld a, $54 call Predef ld hl, UndergroundTunnelEntranceRoute5_5d6af @@ -96938,20 +96938,20 @@ Unknown_5dc2a: ; 5dc2a (17:5c2a) call PrintText xor a ld [W_ANIMATIONID], a - ld [W_CURMENUITEMID], a - ld [W_OLDMENUITEMID], a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a ld a, $3 - ld [W_MENUWATCHEDKEYS], a + ld [wMenuWatchedKeys], a ld a, $3 - ld [W_MAXMENUITEMID], a + ld [wMaxMenuItem], a ld a, $2 - ld [W_TOPMENUITEMY], a + ld [wTopMenuItemY], a ld a, $1 - ld [W_TOPMENUITEMX], a + ld [wTopMenuItemX], a .asm_5c51 ld hl, $d730 set 6, [hl] - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $8 ld c, $d call TextBoxBorder @@ -96963,7 +96963,7 @@ Unknown_5dc2a: ; 5dc2a (17:5c2a) call HandleMenuInput bit 1, a jr nz, .asm_5dc93 ; 0x5dc74 $1d - ld a, [W_CURMENUITEMID] + ld a, [wCurrentMenuItem] cp $3 jr z, .asm_5dc93 ; 0x5dc7b $16 ld hl, $d730 @@ -97067,7 +97067,7 @@ UnnamedText_5ddf7: ; 5ddf7 (17:5df7) db "@" call EnableAutoTextBoxDrawing - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [$cd5b], a ld a, [$d773] bit 0, a @@ -97255,7 +97255,7 @@ PokemonTower2Script: ; 604f2 (18:44f2) Func_604fe: ; 604fe (18:44fe) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -97314,7 +97314,7 @@ PokemonTower2Script1: ; 60563 (18:4563) cp $ff jp z, Func_604fe ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d764 set 7, [hl] ld a, $1 @@ -97355,7 +97355,7 @@ PokemonTower2Script2: ; 605bb (18:45bb) ld a, $11 call Predef xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call Func_2307 ld a, $0 ld [W_POKEMONTOWER2CURSCRIPT], a @@ -97758,7 +97758,7 @@ PokemonTower5Script0: ; 6094b (18:494b) xor a ld [H_CURRENTPRESSEDBUTTONS], a ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d72e set 4, [hl] ld a, $7 @@ -97771,7 +97771,7 @@ PokemonTower5Script0: ; 6094b (18:494b) ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ret CoordsData_60992: ; 60992 (18:4992) @@ -97952,7 +97952,7 @@ PokemonTower6Script: ; 60aef (18:4aef) Func_60b02: ; 60b02 (18:4b02) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -97993,13 +97993,13 @@ PokemonTower6Script4: ; 60b48 (18:4b48) cp $ff jp z, Func_60b02 ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, [$d72d] bit 6, a ret nz call UpdateSprites ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, [$cf0b] and a jr nz, .asm_60b82 @@ -98009,7 +98009,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_CURMAPSCRIPT], a @@ -98201,7 +98201,7 @@ PokemonTower7Script: ; 60d05 (18:4d05) Func_60d18: ; 60d18 (18:4d18) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_POKEMONTOWER7CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -98214,14 +98214,14 @@ PokemonTower7ScriptPointers: ; 60d23 (18:4d23) dw PokemonTower7Script4 PokemonTower7Script2: ; 60d23 (18:4d23) - ld hl, W_FLAGS_CD60 + ld hl, wFlags_0xcd60 res 0, [hl] ld a, [W_ISINBATTLE] ; $d057 cp $ff jp z, Func_60d18 call EndTrainerBattle ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, [$cf13] ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -98247,9 +98247,9 @@ PokemonTower7Script3: ; 60d56 (18:4d56) ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [$cf13], a - ld [W_TRAINERHEADERFLAGBIT], a + ld [wTrainerHeaderFlagBit], a ld [$da38], a ld a, $0 ld [W_POKEMONTOWER7CURSCRIPT], a @@ -98258,7 +98258,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56) PokemonTower7Script4: ; 60d86 (18:4d86) ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $43 ld [$cc4d], a ld a, $11 @@ -98554,16 +98554,16 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) ld hl, $d730 set 6, [hl] xor a - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld a, $3 - ld [W_MENUWATCHEDKEYS], a ; $cc29 + ld [wMenuWatchedKeys], a ; $cc29 ld a, [$cd37] dec a - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 ld a, $2 - ld [W_TOPMENUITEMY], a ; $cc24 + ld [wTopMenuItemY], a ; $cc24 ld a, $1 - ld [W_TOPMENUITEMX], a ; $cc25 + ld [wTopMenuItemX], a ; $cc25 ld a, [$cd37] dec a ld bc, $2 @@ -98572,7 +98572,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) dec l ld b, l ld c, $d - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap call TextBoxBorder call UpdateSprites call Func_610c2 @@ -98582,7 +98582,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) bit 1, a jr nz, .asm_610a7 ld hl, $cc5b - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld d, $0 ld e, a add hl, de @@ -98607,7 +98607,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) ld hl, UnnamedText_610ae call PrintText call YesNoChoice - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a jr nz, .asm_610a7 ld hl, UnnamedText_610b3 @@ -98956,7 +98956,7 @@ SSAnne2Script: ; 6139f (18:539f) Func_613ab: ; 613ab (18:53ab) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_SSANNE2CURSCRIPT], a ret @@ -98993,7 +98993,7 @@ SSAnne2Script0: ; 613be (18:53be) xor a ld [H_CURRENTPRESSEDBUTTONS], a ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, [$ff00+$db] cp $2 jr nz, .asm_61400 ; 0x613f9 $5 @@ -99038,7 +99038,7 @@ SSAnne2Script1: ; 61430 (18:5430) ret nz call Func_61416 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $2 ld [$ff00+$8c], a call DisplayTextID @@ -99073,7 +99073,7 @@ SSAnne2Script2: ; 6146d (18:546d) jp z, Func_613ab call Func_61416 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $3 ld [$ff00+$8c], a call DisplayTextID @@ -99112,7 +99112,7 @@ SSAnne2Script3: ; 614be (18:54be) bit 0, a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $71 ld [$cc4d], a ld a, $11 @@ -100523,7 +100523,7 @@ INCBIN "baserom.gbc",$6219b,$621c4 - $6219b Func_621c4: ; 621c4 (18:61c4) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Func_621c8: ; 621c8 (18:61c8) ld [W_SILPHCO11CURSCRIPT], a @@ -100545,12 +100545,12 @@ SilphCo11Script0: ; 621db (18:61db) ld hl, CoordsData_62211 ; $6211 call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [$cf0d], a xor a ld [H_CURRENTPRESSEDBUTTONS], a ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $3 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -100594,7 +100594,7 @@ SilphCo11Script5: ; 62227 (18:6227) .asm_62240 call Func_6221a ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $6 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -100606,7 +100606,7 @@ SilphCo11Script5: ; 62227 (18:6227) ld hl, $d838 set 7, [hl] xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a jp Func_621c8 SilphCo11Script3: ; 6226a (18:626a) @@ -100643,7 +100643,7 @@ SilphCo11Script4: ; 62293 (18:6293) call EngageMapTrainer call InitBattleEnemyParameters xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $5 jp Func_621c8 @@ -101116,7 +101116,7 @@ Func_70000: ; 70000 (1c:4000) ld bc, $40 call CopyData ld hl, GameFreakShootingStarOAMData ; $4180 - ld de, W_OAMBUFFER + ld de, wOAMBuffer ld bc, $10 jp CopyData @@ -101124,7 +101124,7 @@ Func_70044: ; 70044 (1c:4044) call Func_70000 ld a, $c2 call PlaySound - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld bc, $a004 .asm_70052 push hl @@ -101152,7 +101152,7 @@ Func_70044: ; 70044 (1c:4044) .asm_70070 cp b jr nz, .asm_70052 - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld c, $4 ld de, $4 .asm_7007b @@ -101170,7 +101170,7 @@ Func_70044: ; 70044 (1c:4044) ret c dec b jr nz, .asm_70083 - ld de, W_OAMBUFFER + ld de, wOAMBuffer ld a, $18 .asm_70098 push af @@ -101181,7 +101181,7 @@ Func_70044: ; 70044 (1c:4044) dec a jr nz, .asm_70098 xor a - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d ld hl, Unknown_700f2 ; $40f2 ld c, $6 .asm_700af @@ -101206,16 +101206,16 @@ Func_70044: ; 70044 (1c:4044) inc hl dec c jr nz, .asm_700ba - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $18 jr z, .asm_700d5 add $6 - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d .asm_700d5 call Func_7011f push af ld hl, $c310 - ld de, W_OAMBUFFER + ld de, wOAMBuffer ld bc, $50 call CopyData pop af @@ -101237,7 +101237,7 @@ Func_7011f: ; 7011f (1c:411f) ld b, $8 .asm_70121 ld hl, $c35c - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld de, $fffc ld c, a .asm_7012b @@ -101329,7 +101329,7 @@ Func_701a0: ; 701a0 (1c:41a0) inc c push hl push bc - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d ld a, c ld [$cd3e], a ld hl, W_PARTYMON1_LEVEL ; $d18c @@ -101365,7 +101365,7 @@ Func_701a0: ; 701a0 (1c:41a0) ld [hl], $ff call Func_73b0d xor a - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d inc a ld [$cd40], a call Func_70278 @@ -101386,7 +101386,7 @@ Func_70278: ; 70278 (1c:4278) ld [$FF00+$af], a ld a, $c0 ld [$FF00+$ae], a - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [$cf91], a ld [$d0b5], a ld [$cfd9], a @@ -101459,13 +101459,13 @@ Func_702f0: ; 702f0 (1c:42f0) FuncCoord 8, 7 ; $c434 ld hl, Coord call PrintLevelCommon - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [$d0b5], a FuncCoord 3, 9 ; $c457 ld hl, Coord ld a, $4b call Predef ; indirect jump to Func_27d6b (27d6b (9:7d6b)) - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d jp PlayCry HoFMonInfoText: ; 70329 (1c:4329) @@ -101536,7 +101536,7 @@ Func_70377: ; 70377 (1c:4377) call PlaceString FuncCoord 4, 10 ; $c46c ld hl, Coord - ld de, W_PLAYERMONEY3 ; $d347 + ld de, wPlayerMoney ; $d347 ld c, $a3 call PrintBCDNumber ld hl, UnnamedText_703fa ; $43fa @@ -101569,7 +101569,7 @@ Func_70404: ; 70404 (1c:4404) ld bc, $10 ld a, [$cd3e] call AddNTimes - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld [hli], a ld a, [$cd3f] ld [hli], a @@ -101584,7 +101584,7 @@ Func_70423: ; 70423 (1c:4423) ld [$cfc8], a ld [$cfc9], a ld a, $ff - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a jp GBFadeOut2 Func_70433: ; 70433 (1c:4433) @@ -101605,12 +101605,12 @@ Func_70433: ; 70433 (1c:4433) ld de, Unknown_704d7 ; $44d7 call Func_70503 ld a, $4 - ld [W_CURCHANNELPOINTER], a + ld [wMusicChannelPointer], a ld a, $ff ld [$c0ee], a call PlaySound .asm_70464 - ld a, [W_CURCHANNELPOINTER] + ld a, [wMusicChannelPointer] and a jr nz, .asm_70464 ld a, [W_NUMINPARTY] ; $d163 @@ -101709,7 +101709,7 @@ Func_70510: ; 70510 (1c:4510) ld a, b and a jr nz, .asm_7055b - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d xor a ld [hli], a inc a @@ -101737,7 +101737,7 @@ Func_70510: ; 70510 (1c:4510) call Func_706d7 ld a, $a4 call PlaySound - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d xor a ld [hli], a ld a, $c @@ -101752,7 +101752,7 @@ Unknown_70592: ; 70592 (1c:4592) INCBIN "baserom.gbc",$70592,$705aa - $70592 Func_705aa: ; 705aa (1c:45aa) - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d ld a, $10 ld [hli], a ld a, $3c @@ -101772,7 +101772,7 @@ _DoFlyOrTeleportAwayGraphics: ; 705ba (1c:45ba) .asm_705c8 ld a, $9f call PlaySound - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d ld a, $f0 ld [hli], a ld a, $ec @@ -101795,7 +101795,7 @@ _DoFlyOrTeleportAwayGraphics: ; 705ba (1c:45ba) ld a, [$d732] bit 6, a jr z, .asm_70610 - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d ld a, $10 ld [hli], a ld a, $ff @@ -101808,7 +101808,7 @@ _DoFlyOrTeleportAwayGraphics: ; 705ba (1c:45ba) jr .asm_705c8 .asm_70610 call Func_706d7 - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d ld a, $ff ld [hli], a ld a, $8 @@ -101817,7 +101817,7 @@ _DoFlyOrTeleportAwayGraphics: ; 705ba (1c:45ba) call Func_706ae ld a, $a4 call PlaySound - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d xor a ld [hli], a ld a, $c @@ -101850,7 +101850,7 @@ Func_7067d: ; 7067d (1c:467d) ld a, [$c306] ld [$c30e], a ld a, $a0 - ld [W_OAMBUFFER], a + ld [wOAMBuffer], a ld [$c304], a ld c, $2 call DelayFrames @@ -101868,7 +101868,7 @@ Func_706ae: ; 706ae (1c:46ae) ld [$cd3f], a ld [$c102], a call Delay3 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $ff jr z, .asm_706cd ld hl, $c104 @@ -101932,7 +101932,7 @@ Func_70717: ; 70717 (1c:4717) Func_70730: ; 70730 (1c:4730) call Func_70717 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld c, a and $3 jr nz, .asm_70743 @@ -101942,7 +101942,7 @@ Func_70730: ; 70730 (1c:4730) .asm_70743 ld a, [$cd3e] add c - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d ld c, a ld a, [$cd3f] cp c @@ -101952,7 +101952,7 @@ Func_70730: ; 70730 (1c:4730) Func_70755: ; 70755 (1c:4755) call Func_70717 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld c, a ld a, [$c104] add c @@ -102032,7 +102032,7 @@ Func_707b6: ; 707b6 (1c:47b6) call CopyData ld c, $64 call DelayFrames - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d and a ld hl, UnnamedText_70847 ; $4847 jr z, .asm_70836 @@ -102112,7 +102112,7 @@ _HandleMidJump: ; 7087e (1c:487e) ld [$c104], a ret .asm_70895 - ld a, [W_WALKCOUNTER] ; $cfc5 + ld a, [wWalkCounter] ; $cfc5 cp $0 ret nz call UpdateSprites @@ -102127,7 +102127,7 @@ _HandleMidJump: ; 7087e (1c:487e) ld hl, $d730 res 7, [hl] xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ret Unknown_708ba: ; 708ba (1c:48ba) @@ -102190,7 +102190,7 @@ Func_7092a: ; 7092a (1c:492a) ld [W_BASECOORDY], a ; $d082 ld a, $70 ld [W_BASECOORDX], a ; $d081 - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld bc, $606 ld d, $8 .asm_70948 @@ -102407,8 +102407,8 @@ Func_70a69: ; 70a69 (1c:4a69) Func_70aaa: ; 70aaa (1c:4aaa) ld a, $7 - ld [W_WHICHTRADE], a ; $cd3d - ld hl, W_SCREENTILESBUFFER + ld [wWhichTrade], a ; $cd3d + ld hl, wTileMap ld c, $11 ld de, $14 call Func_70ae0 @@ -102441,13 +102441,13 @@ Func_70ae0: ; 70ae0 (1c:4ae0) ld [hl], $ff add hl, de push bc - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d dec a jr nz, .asm_70af0 call Func_70d19 ld a, $7 .asm_70af0 - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d pop bc dec c jr nz, .asm_70ae1 @@ -102590,7 +102590,7 @@ INCBIN "baserom.gbc",$70b72,$70b7f - $70b72 call Func_70c12 FuncCoord 0, 1 ; $c3b4 ld hl, Coord - ld de, W_SCREENTILESBUFFER + ld de, wTileMap ld bc, $28 call Func_70c12 FuncCoord 18, 0 ; $c3b2 @@ -102601,7 +102601,7 @@ INCBIN "baserom.gbc",$70b72,$70b7f - $70b72 call Func_70c3f FuncCoord 1, 0 ; $c3a1 ld hl, Coord - ld de, W_SCREENTILESBUFFER + ld de, wTileMap ld bc, $2 call Func_70c3f call Func_70d19 @@ -102615,7 +102615,7 @@ INCBIN "baserom.gbc",$70b72,$70b7f - $70b72 Func_70c12: ; 70c12 (1c:4c12) ld a, c - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d ld a, b ld [$cd3e], a ld c, $8 @@ -102627,7 +102627,7 @@ Func_70c12: ; 70c12 (1c:4c12) call CopyData pop hl pop de - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld c, a ld a, [$cd3e] ld b, a @@ -102647,7 +102647,7 @@ Func_70c12: ; 70c12 (1c:4c12) Func_70c3f: ; 70c3f (1c:4c3f) ld a, c - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d ld a, b ld [$cd3e], a ld c, $9 @@ -102675,7 +102675,7 @@ Func_70c3f: ; 70c3f (1c:4c3f) jr nz, .asm_70c4e pop hl pop de - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld c, a ld a, [$cd3e] ld b, a @@ -102694,7 +102694,7 @@ Func_70c3f: ; 70c3f (1c:4c3f) jr nz, .asm_70c77 ret ld c, $12 - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap FuncCoord 1, 17 ; $c4f5 ld de, Coord xor a @@ -102731,7 +102731,7 @@ Func_70caa: ; 70caa (1c:4caa) jr nz, .asm_70cac ret ld c, $14 - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap FuncCoord 19, 1 ; $c3c7 ld de, Coord xor a @@ -102810,7 +102810,7 @@ Func_70d19: ; 70d19 (1c:4d19) jp Func_70a69 Func_70d50: ; 70d50 (1c:4d50) - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d ld a, [hli] ld [$cd3e], a ld a, [hli] @@ -102846,7 +102846,7 @@ asm_70dc5 dec c jr nz, .asm_70dc9 pop hl - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d and a ld bc, $14 jr z, .asm_70de5 @@ -102892,8 +102892,8 @@ Func_70e3e: ; 70e3e (1c:4e3e) ld hl, Coord ld de, $cd6d call PlaceString - ld hl, W_OAMBUFFER - ld de, W_SCREENTILESBACKBUFFER + ld hl, wOAMBuffer + ld de, wTileMapBackup ld bc, $10 call CopyData ld hl, $8040 @@ -102901,16 +102901,16 @@ Func_70e3e: ; 70e3e (1c:4e3e) ld bc, (BANK(TownMapCursor) << 8) + $04 call CopyVideoDataDouble xor a - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d pop af jr asm_70e92 Func_70e7e: ; 70e7e (1c:4e7e) - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld bc, $114 call ClearScreenArea ld hl, TownMapOrder ; $4f11 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d ld c, a ld b, $0 add hl, bc @@ -102964,22 +102964,22 @@ asm_70e92: ; 70e92 (1c:4e92) ld [hl], a ret .asm_70ef2 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d inc a cp $2f jr nz, .asm_70efb xor a .asm_70efb - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d jp Func_70e7e .asm_70f01 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d dec a cp $ff jr nz, .asm_70f0b ld a, $2e .asm_70f0b - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d jp Func_70e7e TownMapOrder: ; 70f11 (1c:4f11) @@ -103079,7 +103079,7 @@ Func_70f90: ; 70f90 (1c:4f90) push af ld [hl], $ff push hl - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld de, ToText ; $506d call PlaceString ld a, [W_CURMAP] ; $d35e @@ -103181,7 +103181,7 @@ ToText: ; 7106d (1c:506d) db "To@" Func_71070: ; 71070 (1c:5070) - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d ld [hl], $ff inc hl ld a, [$d70b] @@ -103211,7 +103211,7 @@ Func_7109b: ; 7109b (1c:509b) call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld b, $12 ld c, $12 call TextBoxBorder @@ -103226,7 +103226,7 @@ Func_7109b: ; 7109b (1c:509b) ld bc, $8 ld a, BANK(MonNestIcon) call FarCopyDataDouble - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld de, CompressedMap ; $5100 .asm_710d3 ld a, [de] @@ -103291,8 +103291,8 @@ Func_711c4: ; 711c4 (1c:51c4) inc de cp $50 jr nz, .asm_711dc - ld hl, W_OAMBUFFER - ld de, W_SCREENTILESBACKBUFFER + ld hl, wOAMBuffer + ld de, wTileMapBackup ld bc, $a0 jp CopyData @@ -103301,7 +103301,7 @@ Func_711ef: ; 711ef (1c:51ef) ld hl, Func_e9cb call Bankswitch ; indirect jump to Func_e9cb (e9cb (3:69cb)) call Func_712d9 - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld de, $cee9 .asm_71200 ld a, [de] @@ -103342,8 +103342,8 @@ Func_711ef: ; 711ef (1c:51ef) ld b, $0 call Func_711c4 .asm_7123e - ld hl, W_OAMBUFFER - ld de, W_SCREENTILESBACKBUFFER + ld hl, wOAMBuffer + ld de, wTileMapBackup ld bc, $a0 jp CopyData @@ -103720,14 +103720,14 @@ Func_716c6: ; 716c6 (1c:56c6) jr z, .asm_716e1 cp $32 jr nz, .asm_716f1 - ld hl, W_SCREENTILESBACKBUFFER - ld de, W_OAMBUFFER + ld hl, wTileMapBackup + ld de, wOAMBuffer ld bc, $90 call CopyData xor a jr .asm_716f1 .asm_716e1 - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld b, $24 ld de, $4 .asm_716e9 @@ -103742,14 +103742,14 @@ Func_716c6: ; 716c6 (1c:56c6) Func_716f7: ; 716f7 (1c:56f7) xor a - ld [W_CURMENUITEMID], a ; $cc26 + ld [wCurrentMenuItem], a ; $cc26 ld b, a inc a jr asm_7170a Func_716ff: ; 716ff (1c:56ff) ld hl, $cf1f - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 ld c, a ld b, $0 add hl, bc @@ -103780,7 +103780,7 @@ asm_7170a: ; 7170a (1c:570a) .asm_7172c push bc ld hl, $cc5b - ld de, W_OAMBUFFER + ld de, wOAMBuffer ld bc, $60 call CopyData pop bc @@ -103790,7 +103790,7 @@ asm_7170a: ; 7170a (1c:570a) push bc ld hl, $c302 ld bc, $10 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 call AddNTimes ld c, $40 ld a, [hl] @@ -103934,7 +103934,7 @@ asm_718c3: ; 718c3 (1c:58c3) .asm_718da call Func_71281 .asm_718dd - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer ld de, $cc5b ld bc, $60 jp CopyData @@ -104043,10 +104043,10 @@ MonOverworldSprites: INCBIN "gfx/mon_ow_sprites.2bpp" Predef54: ; 71ad9 (1c:5ad9) -; trigger the trade offer/action specified by W_WHICHTRADE +; trigger the trade offer/action specified by wWhichTrade call SaveScreenTilesToBuffer2 ld hl,TradeMons - ld a,[W_WHICHTRADE] + ld a,[wWhichTrade] ld b,a swap a sub b @@ -104080,7 +104080,7 @@ Predef54: ; 71ad9 (1c:5ad9) ld de,$cd1e call Function71b6a ld hl,$d737 - ld a,[W_WHICHTRADE] + ld a,[wWhichTrade] ld c,a ld b,$2 ld a,$10 @@ -104164,7 +104164,7 @@ Function71c07: ; 71c07 (1c:5c07) ld a,[hl] ld [$d127],a ld hl,$d737 - ld a,[W_WHICHTRADE] + ld a,[wWhichTrade] ld c,a ld b,$1 ld a,$10 @@ -104224,14 +104224,14 @@ Func_71ca2: ; 71ca2 (1c:5ca2) jp Bankswitch ; indirect jump to LoadWildData (ceb8 (3:4eb8)) Func_71cc1: ; 71cc1 (1c:5cc1) - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d ld a, [$cd0f] ld [hli], a ld a, [$cd34] ld [hl], a ld hl, W_PARTYMON1OT ; $d273 ld bc, $b - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call AddNTimes ld de, $cd41 ld bc, $b @@ -104243,7 +104243,7 @@ Func_71cc1: ; 71cc1 (1c:5cc1) call Func_71d11 ld hl, W_PARTYMON1_OTID ; $d177 ld bc, $2c - ld a, [W_WHICHPOKEMON] ; $cf92 + ld a, [wWhichPokemon] ; $cf92 call AddNTimes ld de, $cd4c ld bc, $2 @@ -105457,13 +105457,13 @@ LoadSAVCheckSum: ; 73623 (1c:7623) ld bc, $b call CopyData ld hl, $a5a3 - ld de, W_OWNEDPOKEMON ; $d2f7 + ld de, wPokedexOwned ; $d2f7 ld bc, $789 call CopyData ld hl, W_CURMAPTILESET ; $d367 set 7, [hl] ld hl, $ad2c - ld de, $c100 + ld de, wSpriteStateData1 ld bc, $200 call CopyData ld a, [$b522] @@ -105513,7 +105513,7 @@ LoadSAVCheckSum2: ; 736bd (1c:76bd) ld bc, $194 call CopyData ld hl, $a5a3 - ld de, W_OWNEDPOKEMON ; $d2f7 + ld de, wPokedexOwned ; $d2f7 ld bc, $26 call CopyData and a @@ -105606,11 +105606,11 @@ SaveSAVtoSRAM0: ; 7378c (1c:778c) ld de, $a598 ld bc, $b call CopyData - ld hl, W_OWNEDPOKEMON ; $d2f7 + ld hl, wPokedexOwned ; $d2f7 ld de, $a5a3 ld bc, $789 call CopyData - ld hl, $c100 ; OAM? + ld hl, wSpriteStateData1 ; OAM? ld de, $ad2c ld bc, $200 call CopyData @@ -105659,7 +105659,7 @@ SaveSAVtoSRAM2: ; 7380f (1c:780f) ld de, $af2c ld bc, $194 call CopyData - ld hl, W_OWNEDPOKEMON ; pokédex only + ld hl, wPokedexOwned ; pokédex only ld de, $a5a3 ld bc, $26 call CopyData @@ -105737,7 +105737,7 @@ Func_738a1: ; 738a1 (1c:78a1) ld hl, UnnamedText_73909 ; $7909 call PrintText call YesNoChoice - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 and a ret nz ld hl, $d5a0 @@ -105757,14 +105757,14 @@ Func_738a1: ; 738a1 (1c:78a1) ld d, h ld hl, W_NUMINBOX ; $da80 call Func_7390e - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 set 7, a ld [$d5a0], a call Func_7387b ld de, W_NUMINBOX ; $da80 call Func_7390e ld hl, W_MAPTEXTPTR ; $d36c - ld de, W_WHICHTRADE ; $cd3d + ld de, wWhichTrade ; $cd3d ld a, [hli] ld [de], a inc de @@ -105772,7 +105772,7 @@ Func_738a1: ; 738a1 (1c:78a1) ld [de], a call Func_3f05 call SaveSAVtoSRAM - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d call Func_3f0f ld a, $b6 call PlaySoundWaitForCurrent @@ -105812,20 +105812,20 @@ Func_7393f: ; 7393f (1c:793f) xor a ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba ld a, $3 - ld [W_MENUWATCHEDKEYS], a ; $cc29 + ld [wMenuWatchedKeys], a ; $cc29 ld a, $b - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 ld a, $1 - ld [W_TOPMENUITEMY], a ; $cc24 + ld [wTopMenuItemY], a ; $cc24 ld a, $c - ld [W_TOPMENUITEMX], a ; $cc25 + ld [wTopMenuItemX], a ; $cc25 xor a ld [$cc37], a ld a, [$d5a0] and $7f - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_OLDMENUITEMID], a ; $cc2a - ld hl, W_SCREENTILESBUFFER + ld [wCurrentMenuItem], a ; $cc26 + ld [wLastMenuItem], a ; $cc2a + ld hl, wTileMap ld b, $2 ld c, $9 call TextBoxBorder @@ -105866,7 +105866,7 @@ Func_7393f: ; 7393f (1c:793f) call Func_73a84 FuncCoord 18, 1 ; $c3c6 ld hl, Coord - ld de, W_WHICHTRADE ; $cd3d + ld de, wWhichTrade ; $cd3d ld bc, $14 ld a, $c .asm_739c2 @@ -105950,7 +105950,7 @@ Func_73a7f: ; 73a7f (1c:7a7f) ret Func_73a84: ; 73a84 (1c:7a84) - ld hl, W_WHICHTRADE ; $cd3d + ld hl, wWhichTrade ; $cd3d push hl ld a, $a ld [$0], a @@ -106050,7 +106050,7 @@ Func_73b0d: ; 73b0d (1c:7b0d) Func_73b3f: ; 73b3f (1c:7b3f) ld hl, $a598 ld bc, $60 - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d call AddNTimes ld de, $cc5b ld bc, $60 @@ -106130,7 +106130,7 @@ Func_7405c: ; 7405c (1d:405c) ld bc, $10 ld a, $ff call FillMemory - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap call Func_7417b FuncCoord 0, 14 ; $c4b8 ld hl, Coord @@ -106146,7 +106146,7 @@ Func_7405c: ; 7405c (1d:405c) ld c, $80 call DelayFrames xor a - ld [W_WHICHTRADE], a ; $cd3d + ld [wWhichTrade], a ; $cd3d ld [$cd3e], a jp Func_7418e @@ -106741,7 +106741,7 @@ Gym8LeaderName: ; 748cd (1d:48cd) Func_748d6: ; 748d6 (1d:48d6) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_VIRIDIANGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -106768,7 +106768,7 @@ ViridianGymScript0: ; 748eb (1d:48eb) ld a, $a7 call PlaySound ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $4 ld [W_CURMAPSCRIPT], a ret @@ -106849,7 +106849,7 @@ ViridianGymScript4: ; 7496b (1d:496b) and a jr nz, .asm_74980 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d736 res 7, [hl] ld a, $0 @@ -106865,7 +106865,7 @@ ViridianGymScript3: ; 74988 (1d:4988) cp $ff jp z, Func_748d6 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Unknown_74995: ; 74995 (1d:4995) ld a, $c ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c @@ -107394,8 +107394,8 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15) ld hl, UnnamedText_74e77 call PrintText xor a - ld [W_CURMENUITEMID], a - ld [W_LISTSCROLLOFFSET], a + ld [wCurrentMenuItem], a + ld [wListScrollOffset], a .asm_74e23 ld hl, UnnamedText_74e7c call PrintText @@ -107410,7 +107410,7 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15) ld [$cf93], a ld [$cc35], a ld a, SPECIALLISTMENU - ld [W_LISTMENUID], a + ld [wListMenuID], a call DisplayListMenuID jr c, .asm_74e60 ; 0x74e49 $15 ld hl, Unknown_74e86 @@ -107427,7 +107427,7 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15) jr .asm_74e23 ; 0x74e5e $c3 .asm_74e60 xor a - ld [W_LISTSCROLLOFFSET], a + ld [wListScrollOffset], a ld hl, UnnamedText_74e81 call PrintText jp TextScriptEnd @@ -107514,16 +107514,16 @@ Func_74ee0: ; 74ee0 (1d:4ee0) ld [$d125], a call DisplayTextBoxID xor a - ld [W_CURMENUITEMID], a ; $cc26 - ld [W_OLDMENUITEMID], a ; $cc2a + ld [wCurrentMenuItem], a ; $cc26 + ld [wLastMenuItem], a ; $cc2a ld a, $3 - ld [W_MENUWATCHEDKEYS], a ; $cc29 + ld [wMenuWatchedKeys], a ; $cc29 ld a, $3 - ld [W_MAXMENUITEMID], a ; $cc28 + ld [wMaxMenuItem], a ; $cc28 ld a, $5 - ld [W_TOPMENUITEMY], a ; $cc24 + ld [wTopMenuItemY], a ; $cc24 ld a, $1 - ld [W_TOPMENUITEMX], a ; $cc25 + ld [wTopMenuItemX], a ; $cc25 ld hl, $d730 set 6, [hl] FuncCoord 0, 3 ; $c3dc @@ -107545,7 +107545,7 @@ Func_74ee0: ; 74ee0 (1d:4ee0) call HandleMenuInput bit 1, a jr nz, .asm_74f93 - ld a, [W_CURMENUITEMID] ; $cc26 + ld a, [wCurrentMenuItem] ; $cc26 cp $3 jr z, .asm_74f93 xor a @@ -107577,7 +107577,7 @@ Func_74ee0: ; 74ee0 (1d:4ee0) ld hl, UnnamedText_74fd8 call PrintText ld hl, $ffde - ld de, W_PLAYERMONEY1 ; $d349 + ld de, wPlayerMoney + 2 ; $d349 ld c, $3 ld a, $c call Predef ; indirect jump to Func_f836 (f836 (3:7836)) @@ -107923,7 +107923,7 @@ SafariZoneEntranceScript0: ; 751e7 (1d:51e7) ld [$ff00+$8c], a call DisplayTextID ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a xor a ld [H_CURRENTPRESSEDBUTTONS], a ld a, $c @@ -107939,7 +107939,7 @@ SafariZoneEntranceScript0: ; 751e7 (1d:51e7) ld c, $1 call Func_752a3 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $1 ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret @@ -107955,20 +107955,20 @@ SafariZoneEntranceScript1: ; 75226 (1d:5226) SafariZoneEntranceScript2: ; 7522a (1d:522a) xor a ld [H_CURRENTPRESSEDBUTTONS], a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call UpdateSprites ld a, $4 ld [$ff00+$8c], a call DisplayTextID ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ret SafariZoneEntranceScript3: ; 75240 (1d:5240) call Func_752b4 ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $5 ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret @@ -107983,7 +107983,7 @@ SafariZoneEntranceScript5: ; 7524e (1d:524e) res 7, [hl] call UpdateSprites ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $6 ld [$ff00+$8c], a call DisplayTextID @@ -108006,7 +108006,7 @@ SafariZoneEntranceScript4: ; 75287 (1d:5287) call Func_752b4 ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret @@ -108087,10 +108087,10 @@ SafariZoneEntranceText4: ; 752ca (1d:52ca) call PrintText ld a, $1e ld [$da47], a - ld a, $1 - ld [$d70d], a - ld a, $f6 - ld [$d70e], a + ld a, 502 / $100 + ld [wSafariSteps], a + ld a, 502 % $100 + ld [wSafariSteps + 1], a ld a, $40 ld c, $3 call Func_752a3 @@ -108260,7 +108260,7 @@ Gym5LeaderName: ; 75472 (1d:5472) Func_75477: ; 75477 (1d:5477) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_FUCHSIAGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -108276,7 +108276,7 @@ FuchsiaGymScript3: ; 7548a (1d:548a) cp $ff jp z, Func_75477 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Unknown_75497: ; 75497 (1d:5497) ld a, $9 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c @@ -108683,7 +108683,7 @@ Gym7LeaderName: ; 7578b (1d:578b) Unknown_75792: ; 75792 (1d:5792) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_CINNABARGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ld [$da38], a @@ -108691,7 +108691,7 @@ Unknown_75792: ; 75792 (1d:5792) Unknown_757a0: ; 757a0 (1d:57a0) ld a, [H_DOWNARROWBLINKCNT2] ; $FF00+$8c - ld [W_TRAINERHEADERFLAGBIT], a + ld [wTrainerHeaderFlagBit], a ret CinnabarGymScriptPointers: ; 757a6 (1d:57a6) @@ -108733,9 +108733,9 @@ CinnabarGymScript1: ; 757dc (1d:57dc) bit 0, a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, [$da38] - ld [W_TRAINERHEADERFLAGBIT], a + ld [wTrainerHeaderFlagBit], a ld [$ff00+$8c], a jp DisplayTextID @@ -108747,7 +108747,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) ld a, [$d057] cp $ff jp z, Unknown_75792 - ld a, [W_TRAINERHEADERFLAGBIT] + ld a, [wTrainerHeaderFlagBit] ld [$ff00+$db], a ld c, a ld b, $2 @@ -108761,13 +108761,13 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) call PlaySound call WaitForSoundToFinish .asm_7581b - ld a, [W_TRAINERHEADERFLAGBIT] + ld a, [wTrainerHeaderFlagBit] ld [$ff00+$db], a ld c, a ld b, $1 ld hl, $d79a call Unknown_757f1 - ld a, [W_TRAINERHEADERFLAGBIT] + ld a, [wTrainerHeaderFlagBit] sub $2 ld c, a ld b, $1 @@ -108775,7 +108775,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) call Unknown_757f1 call Func_3ead xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [$da38], a ld a, $0 ld [W_CINNABARGYMCURSCRIPT], a @@ -108787,7 +108787,7 @@ CinnabarGymScript3: ; 7584a (1d:584a) cp $ff jp z, Unknown_75792 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a Unknown_75857: ; 75857 (1d:5857) ld a, $a ld [$ff00+$8c], a @@ -109249,13 +109249,13 @@ Lab2Text1: ; 75c2a (1d:5c2a) Lab2Text2: ; 75c2f (1d:5c2f) db $8 ld a, $7 - ld [W_WHICHTRADE], a + ld [wWhichTrade], a jr asm_78552 ; 0x75c35 $6 Lab2Text3: ; 75c37 (1d:5c37) db $8 ld a, $8 - ld [W_WHICHTRADE], a + ld [wWhichTrade], a asm_78552: ; 75c3d (1d:5c3d) ld a, $54 call Predef @@ -109490,7 +109490,7 @@ UnnamedText_75dd5: ; 75dd5 (1d:5dd5) Lab4Text2: ; 75dda (1d:5dda) db $08 ; asm ld a, $3 - ld [W_WHICHTRADE], a + ld [wWhichTrade], a ld a, $54 call Predef jp TextScriptEnd @@ -109680,7 +109680,7 @@ GaryScript: ; 75f1d (1d:5f1d) Function75f29: ; 75f29 (1d:5f29) xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_GARYCURSCRIPT], a ret @@ -109702,7 +109702,7 @@ GaryScript0: ; 75f47 (1d:5f47) GaryScript1: ; 75f48 (1d:5f48) ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $ccd3 ld de, RLEMovement75f63 call DecodeRLEList @@ -109725,7 +109725,7 @@ GaryScript2: ; 75f6a (1d:5f6a) ret nz call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $d355 res 7, [hl] ld a, $1 @@ -109771,7 +109771,7 @@ GaryScript3: ; 75fbb (1d:5fbb) ld hl, $d867 set 1, [hl] ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $1 ld [$ff00+$8c], a call Function760c8 @@ -109877,7 +109877,7 @@ GaryScript8: ; 76083 (1d:6083) GaryScript9: ; 76099 (1d:6099) ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld hl, $ccd3 ld de, RLEMovement760b4 call DecodeRLEList @@ -109898,17 +109898,17 @@ GaryScript10: ; 760b9 (1d:60b9) and a ret nz xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld a, $0 ld [W_GARYCURSCRIPT], a ret Function760c8; 0x760c8 ld a, $f0 - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a call DisplayTextID ld a, $ff - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ret GaryTextPointers: ; 760d6 (1d:60d6) @@ -110071,7 +110071,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [H_CURRENTPRESSEDBUTTONS], a ld [$ccd3], a ld [$cd38], a - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $3 jr c, .asm_76206 ld hl, $d863 @@ -110105,7 +110105,7 @@ LoreleiScript3: ; 7622c (1d:622c) ret nz call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_LORELEICURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -110256,7 +110256,7 @@ BrunoScript0: ; 76339 (1d:6339) ld [H_CURRENTPRESSEDBUTTONS], a ld [$ccd3], a ld [$cd38], a - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $3 jr c, .asm_7635d ld hl, $d864 @@ -110290,7 +110290,7 @@ BrunoScript3: ; 76383 (1d:6383) ret nz call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_BRUNOCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -110442,7 +110442,7 @@ AgathaScript0: ; 76490 (1d:6490) ld [H_CURRENTPRESSEDBUTTONS], a ld [$ccd3], a ld [$cd38], a - ld a, [W_WHICHTRADE] ; $cd3d + ld a, [wWhichTrade] ; $cd3d cp $3 jr c, .asm_764b4 ld hl, $d865 @@ -110476,7 +110476,7 @@ AgathaScript3: ; 764da (1d:64da) ret nz call Delay3 xor a - ld [W_JOYPADFORBIDDENBUTTONSMASK], a + ld [wJoypadForbiddenButtonsMask], a ld [W_AGATHACURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -110850,10 +110850,10 @@ HiddenCoins: ; 76799 (1d:6799) ld a, $10 call Predef call EnableAutoTextBoxDrawing - ld a, [W_PLAYERCOINS1] + ld a, [wPlayerCoins] cp $99 jr nz, .RoomInCoinCase - ld a, [W_PLAYERCOINS2] + ld a, [wPlayerCoins + 1] cp $99 jr nz, .RoomInCoinCase ld a, $2c @@ -111068,7 +111068,7 @@ DrawFrameBlock: ; 78000 (1e:4000) jr z,.resetFrameBlockDestAddr call AnimationCleanOAM .resetFrameBlockDestAddr - ld hl,W_OAMBUFFER ; OAM buffer + ld hl,wOAMBuffer ; OAM buffer ld a,l ld [W_FBDESTADDR + 1],a ld a,h @@ -111117,7 +111117,7 @@ PlayAnimation: ; 780f1 (1e:40f1) ld a,[hli] cp a,$FF ; is there a sound to play? jr z,.skipPlayingSound - ld [W_ANIMSOUNDID],a ; store sound + ld [wAnimSoundID],a ; store sound push hl push de call Func586F @@ -111146,7 +111146,7 @@ PlayAnimation: ; 780f1 (1e:40f1) rla ld [$D09F],a ; tile select ld a,[hli] ; sound - ld [W_ANIMSOUNDID],a ; store sound + ld [wAnimSoundID],a ; store sound ld a,[hli] ; subanimation ID ld c,l ld b,h @@ -111448,13 +111448,13 @@ Func_78e23: ; 78e23 (1e:4e23) ret PlaySubanimation: ; 78e53 (1e:4e53) - ld a,[W_ANIMSOUNDID] + ld a,[wAnimSoundID] cp a,$FF jr z,.skipPlayingSound call Func586F call PlaySound ; play sound effect .skipPlayingSound - ld hl,W_OAMBUFFER ; base address of OAM buffer + ld hl,wOAMBuffer ; base address of OAM buffer ld a,l ld [W_FBDESTADDR + 1],a ld a,h @@ -111806,7 +111806,7 @@ Func504C: ; 7904c (1e:504c) ; if it's the end of the animation, make the ball jump up ld de,BallMoveDistances1 .loop - ld hl,W_OAMBUFFER ; OAM buffer + ld hl,wOAMBuffer ; OAM buffer ld bc,4 .innerLoop ld a,[de] @@ -111837,7 +111837,7 @@ BallMoveDistances1: ; 79078 (1e:5078) Func507C ; 507C ld de,BallMoveDistances2 .loop - ld hl,W_OAMBUFFER ; OAM buffer + ld hl,wOAMBuffer ; OAM buffer ld bc,4 .innerLoop ld a,[de] @@ -111877,7 +111877,7 @@ BallMoveDistances2: ; 790b3 (1e:50b3) ; this function copies the current musical note graphic ; so that there are two musical notes flying towards the defending pokemon DoGrowlSpecialEffects: ; 790bc (1e:50bc) - ld hl,W_OAMBUFFER ; OAM buffer + ld hl,wOAMBuffer ; OAM buffer ld de,$c310 ld bc,$10 call CopyData ; copy the musical note graphic @@ -112139,7 +112139,7 @@ Func_79210: ; 79210 (1e:5210) ret Func_79246: ; 79246 (1e:5246) - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer .asm_79249 ld a, [W_BASECOORDY] ; $d082 ld [hli], a @@ -112334,7 +112334,7 @@ INCBIN "baserom.gbc",$793b1,$793f9 - $793b1 .asm_79447 push hl ld c, $3 - ld de, W_OAMBUFFER + ld de, wOAMBuffer .asm_7944d ld a, [hl] cp $ff @@ -112445,7 +112445,7 @@ Func_79517: ; 79517 (1e:5517) call LoadAnimationTileset pop bc ld d, $7a - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer push bc ld a, [W_BASECOORDY] ; $d082 ld e, a @@ -112459,7 +112459,7 @@ Func_79517: ; 79517 (1e:5517) ld [$d08a], a .asm_79538 push bc - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer .asm_7953c ld a, [W_BASECOORDY] ; $d082 add $8 @@ -112727,7 +112727,7 @@ Func_797e8: ; 797e8 (1e:57e8) xor a ld e, a ld [W_BASECOORDX], a ; $d081 - ld hl, W_OAMBUFFER + ld hl, wOAMBuffer .asm_797fa call Func_79329 dec c @@ -112749,7 +112749,7 @@ Func_7980c: ; 7980c (1e:580c) push bc ld e, a ld d, $0 - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap add hl, de ld bc, $707 call ClearScreenArea @@ -112768,7 +112768,7 @@ Func_79820: ; 79820 (1e:5820) .asm_7982a ld a, $c .asm_7982c - ld hl, W_SCREENTILESBUFFER + ld hl, wTileMap ld e, a ld d, $0 add hl, de @@ -113766,28 +113766,28 @@ TechnicalMachinePrices: ; 7bfa7 (1e:7fa7) SECTION "bank1F",ROMX,BANK[$1F] -INCLUDE "music/headers/sfxheaders1f.tx" -INCLUDE "music/headers/musicheaders1f.tx" - -INCLUDE "music/sfx/sfx_1f_01.tx" -INCLUDE "music/sfx/sfx_1f_02.tx" -INCLUDE "music/sfx/sfx_1f_03.tx" -INCLUDE "music/sfx/sfx_1f_04.tx" -INCLUDE "music/sfx/sfx_1f_05.tx" -INCLUDE "music/sfx/sfx_1f_06.tx" -INCLUDE "music/sfx/sfx_1f_07.tx" -INCLUDE "music/sfx/sfx_1f_08.tx" -INCLUDE "music/sfx/sfx_1f_09.tx" -INCLUDE "music/sfx/sfx_1f_0a.tx" -INCLUDE "music/sfx/sfx_1f_0b.tx" -INCLUDE "music/sfx/sfx_1f_0c.tx" -INCLUDE "music/sfx/sfx_1f_0d.tx" -INCLUDE "music/sfx/sfx_1f_0e.tx" -INCLUDE "music/sfx/sfx_1f_0f.tx" -INCLUDE "music/sfx/sfx_1f_10.tx" -INCLUDE "music/sfx/sfx_1f_11.tx" -INCLUDE "music/sfx/sfx_1f_12.tx" -INCLUDE "music/sfx/sfx_1f_13.tx" +INCLUDE "music/headers/sfxheaders1f.asm" +INCLUDE "music/headers/musicheaders1f.asm" + +INCLUDE "music/sfx/sfx_1f_01.asm" +INCLUDE "music/sfx/sfx_1f_02.asm" +INCLUDE "music/sfx/sfx_1f_03.asm" +INCLUDE "music/sfx/sfx_1f_04.asm" +INCLUDE "music/sfx/sfx_1f_05.asm" +INCLUDE "music/sfx/sfx_1f_06.asm" +INCLUDE "music/sfx/sfx_1f_07.asm" +INCLUDE "music/sfx/sfx_1f_08.asm" +INCLUDE "music/sfx/sfx_1f_09.asm" +INCLUDE "music/sfx/sfx_1f_0a.asm" +INCLUDE "music/sfx/sfx_1f_0b.asm" +INCLUDE "music/sfx/sfx_1f_0c.asm" +INCLUDE "music/sfx/sfx_1f_0d.asm" +INCLUDE "music/sfx/sfx_1f_0e.asm" +INCLUDE "music/sfx/sfx_1f_0f.asm" +INCLUDE "music/sfx/sfx_1f_10.asm" +INCLUDE "music/sfx/sfx_1f_11.asm" +INCLUDE "music/sfx/sfx_1f_12.asm" +INCLUDE "music/sfx/sfx_1f_13.asm" Music1f_Channel3DutyPointers: ; 7c361 (1f:4361) dw Music1f_Channel3Duty1 @@ -113815,92 +113815,92 @@ Music1f_Channel3Duty4: ; 7c3a3 (1f:43a3) Music1f_Channel3Duty5: ; 7c3b3 (1f:43b3) db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 -INCLUDE "music/sfx/sfx_1f_3f.tx" -INCLUDE "music/sfx/sfx_1f_56.tx" -INCLUDE "music/sfx/sfx_1f_57.tx" -INCLUDE "music/sfx/sfx_1f_58.tx" -INCLUDE "music/sfx/sfx_1f_3c.tx" -INCLUDE "music/sfx/sfx_1f_59.tx" -INCLUDE "music/sfx/sfx_1f_5a.tx" -INCLUDE "music/sfx/sfx_1f_5b.tx" -INCLUDE "music/sfx/sfx_1f_5c.tx" -INCLUDE "music/sfx/sfx_1f_40.tx" +INCLUDE "music/sfx/sfx_1f_3f.asm" +INCLUDE "music/sfx/sfx_1f_56.asm" +INCLUDE "music/sfx/sfx_1f_57.asm" +INCLUDE "music/sfx/sfx_1f_58.asm" +INCLUDE "music/sfx/sfx_1f_3c.asm" +INCLUDE "music/sfx/sfx_1f_59.asm" +INCLUDE "music/sfx/sfx_1f_5a.asm" +INCLUDE "music/sfx/sfx_1f_5b.asm" +INCLUDE "music/sfx/sfx_1f_5c.asm" +INCLUDE "music/sfx/sfx_1f_40.asm" IF _RED - INCLUDE "music/sfx/sfx_1f_5d.tx" + INCLUDE "music/sfx/sfx_1f_5d.asm" ENDC IF _BLUE - INCLUDE "music/blue/sfx_1f_5d.tx" + INCLUDE "music/blue/sfx_1f_5d.asm" ENDC -INCLUDE "music/sfx/sfx_1f_3d.tx" -INCLUDE "music/sfx/sfx_1f_43.tx" -INCLUDE "music/sfx/sfx_1f_3e.tx" -INCLUDE "music/sfx/sfx_1f_44.tx" -INCLUDE "music/sfx/sfx_1f_45.tx" -INCLUDE "music/sfx/sfx_1f_46.tx" -INCLUDE "music/sfx/sfx_1f_47.tx" -INCLUDE "music/sfx/sfx_1f_48.tx" -INCLUDE "music/sfx/sfx_1f_49.tx" -INCLUDE "music/sfx/sfx_1f_4a.tx" -INCLUDE "music/sfx/sfx_1f_4b.tx" -INCLUDE "music/sfx/sfx_1f_4c.tx" -INCLUDE "music/sfx/sfx_1f_4d.tx" -INCLUDE "music/sfx/sfx_1f_4e.tx" -INCLUDE "music/sfx/sfx_1f_4f.tx" -INCLUDE "music/sfx/sfx_1f_50.tx" -INCLUDE "music/sfx/sfx_1f_51.tx" -INCLUDE "music/sfx/sfx_1f_52.tx" -INCLUDE "music/sfx/sfx_1f_53.tx" -INCLUDE "music/sfx/sfx_1f_54.tx" -INCLUDE "music/sfx/sfx_1f_55.tx" -INCLUDE "music/sfx/sfx_1f_5e.tx" -INCLUDE "music/sfx/sfx_1f_5f.tx" -INCLUDE "music/sfx/sfx_1f_60.tx" -INCLUDE "music/sfx/sfx_1f_61.tx" -INCLUDE "music/sfx/sfx_1f_62.tx" -INCLUDE "music/sfx/sfx_1f_63.tx" -INCLUDE "music/sfx/sfx_1f_64.tx" -INCLUDE "music/sfx/sfx_1f_65.tx" -INCLUDE "music/sfx/sfx_1f_66.tx" -INCLUDE "music/sfx/sfx_1f_67.tx" -INCLUDE "music/sfx/sfx_1f_unused.tx" -INCLUDE "music/sfx/sfx_1f_1d.tx" -INCLUDE "music/sfx/sfx_1f_37.tx" -INCLUDE "music/sfx/sfx_1f_38.tx" -INCLUDE "music/sfx/sfx_1f_25.tx" -INCLUDE "music/sfx/sfx_1f_39.tx" -INCLUDE "music/sfx/sfx_1f_17.tx" -INCLUDE "music/sfx/sfx_1f_23.tx" -INCLUDE "music/sfx/sfx_1f_24.tx" -INCLUDE "music/sfx/sfx_1f_14.tx" -INCLUDE "music/sfx/sfx_1f_22.tx" -INCLUDE "music/sfx/sfx_1f_1a.tx" -INCLUDE "music/sfx/sfx_1f_1b.tx" -INCLUDE "music/sfx/sfx_1f_19.tx" -INCLUDE "music/sfx/sfx_1f_1f.tx" -INCLUDE "music/sfx/sfx_1f_20.tx" -INCLUDE "music/sfx/sfx_1f_16.tx" -INCLUDE "music/sfx/sfx_1f_21.tx" -INCLUDE "music/sfx/sfx_1f_15.tx" -INCLUDE "music/sfx/sfx_1f_1e.tx" -INCLUDE "music/sfx/sfx_1f_1c.tx" -INCLUDE "music/sfx/sfx_1f_18.tx" -INCLUDE "music/sfx/sfx_1f_2d.tx" -INCLUDE "music/sfx/sfx_1f_2a.tx" -INCLUDE "music/sfx/sfx_1f_2f.tx" -INCLUDE "music/sfx/sfx_1f_26.tx" -INCLUDE "music/sfx/sfx_1f_27.tx" -INCLUDE "music/sfx/sfx_1f_28.tx" -INCLUDE "music/sfx/sfx_1f_32.tx" -INCLUDE "music/sfx/sfx_1f_29.tx" -INCLUDE "music/sfx/sfx_1f_2b.tx" -INCLUDE "music/sfx/sfx_1f_30.tx" -INCLUDE "music/sfx/sfx_1f_2e.tx" -INCLUDE "music/sfx/sfx_1f_31.tx" -INCLUDE "music/sfx/sfx_1f_2c.tx" -INCLUDE "music/sfx/sfx_1f_33.tx" -INCLUDE "music/sfx/sfx_1f_34.tx" -INCLUDE "music/sfx/sfx_1f_35.tx" -INCLUDE "music/sfx/sfx_1f_36.tx" +INCLUDE "music/sfx/sfx_1f_3d.asm" +INCLUDE "music/sfx/sfx_1f_43.asm" +INCLUDE "music/sfx/sfx_1f_3e.asm" +INCLUDE "music/sfx/sfx_1f_44.asm" +INCLUDE "music/sfx/sfx_1f_45.asm" +INCLUDE "music/sfx/sfx_1f_46.asm" +INCLUDE "music/sfx/sfx_1f_47.asm" +INCLUDE "music/sfx/sfx_1f_48.asm" +INCLUDE "music/sfx/sfx_1f_49.asm" +INCLUDE "music/sfx/sfx_1f_4a.asm" +INCLUDE "music/sfx/sfx_1f_4b.asm" +INCLUDE "music/sfx/sfx_1f_4c.asm" +INCLUDE "music/sfx/sfx_1f_4d.asm" +INCLUDE "music/sfx/sfx_1f_4e.asm" +INCLUDE "music/sfx/sfx_1f_4f.asm" +INCLUDE "music/sfx/sfx_1f_50.asm" +INCLUDE "music/sfx/sfx_1f_51.asm" +INCLUDE "music/sfx/sfx_1f_52.asm" +INCLUDE "music/sfx/sfx_1f_53.asm" +INCLUDE "music/sfx/sfx_1f_54.asm" +INCLUDE "music/sfx/sfx_1f_55.asm" +INCLUDE "music/sfx/sfx_1f_5e.asm" +INCLUDE "music/sfx/sfx_1f_5f.asm" +INCLUDE "music/sfx/sfx_1f_60.asm" +INCLUDE "music/sfx/sfx_1f_61.asm" +INCLUDE "music/sfx/sfx_1f_62.asm" +INCLUDE "music/sfx/sfx_1f_63.asm" +INCLUDE "music/sfx/sfx_1f_64.asm" +INCLUDE "music/sfx/sfx_1f_65.asm" +INCLUDE "music/sfx/sfx_1f_66.asm" +INCLUDE "music/sfx/sfx_1f_67.asm" +INCLUDE "music/sfx/sfx_1f_unused.asm" +INCLUDE "music/sfx/sfx_1f_1d.asm" +INCLUDE "music/sfx/sfx_1f_37.asm" +INCLUDE "music/sfx/sfx_1f_38.asm" +INCLUDE "music/sfx/sfx_1f_25.asm" +INCLUDE "music/sfx/sfx_1f_39.asm" +INCLUDE "music/sfx/sfx_1f_17.asm" +INCLUDE "music/sfx/sfx_1f_23.asm" +INCLUDE "music/sfx/sfx_1f_24.asm" +INCLUDE "music/sfx/sfx_1f_14.asm" +INCLUDE "music/sfx/sfx_1f_22.asm" +INCLUDE "music/sfx/sfx_1f_1a.asm" +INCLUDE "music/sfx/sfx_1f_1b.asm" +INCLUDE "music/sfx/sfx_1f_19.asm" +INCLUDE "music/sfx/sfx_1f_1f.asm" +INCLUDE "music/sfx/sfx_1f_20.asm" +INCLUDE "music/sfx/sfx_1f_16.asm" +INCLUDE "music/sfx/sfx_1f_21.asm" +INCLUDE "music/sfx/sfx_1f_15.asm" +INCLUDE "music/sfx/sfx_1f_1e.asm" +INCLUDE "music/sfx/sfx_1f_1c.asm" +INCLUDE "music/sfx/sfx_1f_18.asm" +INCLUDE "music/sfx/sfx_1f_2d.asm" +INCLUDE "music/sfx/sfx_1f_2a.asm" +INCLUDE "music/sfx/sfx_1f_2f.asm" +INCLUDE "music/sfx/sfx_1f_26.asm" +INCLUDE "music/sfx/sfx_1f_27.asm" +INCLUDE "music/sfx/sfx_1f_28.asm" +INCLUDE "music/sfx/sfx_1f_32.asm" +INCLUDE "music/sfx/sfx_1f_29.asm" +INCLUDE "music/sfx/sfx_1f_2b.asm" +INCLUDE "music/sfx/sfx_1f_30.asm" +INCLUDE "music/sfx/sfx_1f_2e.asm" +INCLUDE "music/sfx/sfx_1f_31.asm" +INCLUDE "music/sfx/sfx_1f_2c.asm" +INCLUDE "music/sfx/sfx_1f_33.asm" +INCLUDE "music/sfx/sfx_1f_34.asm" +INCLUDE "music/sfx/sfx_1f_35.asm" +INCLUDE "music/sfx/sfx_1f_36.asm" Func_7d13b: ; 7d13b (1f:513b) ld a, [$FF00+$dc] @@ -115625,28 +115625,28 @@ Unknown_7dba3: ; 7dba3 (1f:5ba3) dw $FB9B dw $FBDA -INCLUDE "music/bikeriding.tx" -INCLUDE "music/dungeon1.tx" -INCLUDE "music/gamecorner.tx" -INCLUDE "music/titlescreen.tx" -INCLUDE "music/sfx/sfx_1f_3a.tx" -INCLUDE "music/dungeon2.tx" -INCLUDE "music/dungeon3.tx" -INCLUDE "music/cinnabarmansion.tx" -INCLUDE "music/sfx/sfx_1f_41.tx" -INCLUDE "music/sfx/sfx_1f_3b.tx" -INCLUDE "music/sfx/sfx_1f_42.tx" -INCLUDE "music/oakslab.tx" -INCLUDE "music/pokemontower.tx" -INCLUDE "music/silphco.tx" -INCLUDE "music/meeteviltrainer.tx" -INCLUDE "music/meetfemaletrainer.tx" -INCLUDE "music/meetmaletrainer.tx" -INCLUDE "music/introbattle.tx" -INCLUDE "music/surfing.tx" -INCLUDE "music/jigglypuffsong.tx" -INCLUDE "music/halloffame.tx" -INCLUDE "music/credits.tx" +INCLUDE "music/bikeriding.asm" +INCLUDE "music/dungeon1.asm" +INCLUDE "music/gamecorner.asm" +INCLUDE "music/titlescreen.asm" +INCLUDE "music/sfx/sfx_1f_3a.asm" +INCLUDE "music/dungeon2.asm" +INCLUDE "music/dungeon3.asm" +INCLUDE "music/cinnabarmansion.asm" +INCLUDE "music/sfx/sfx_1f_41.asm" +INCLUDE "music/sfx/sfx_1f_3b.asm" +INCLUDE "music/sfx/sfx_1f_42.asm" +INCLUDE "music/oakslab.asm" +INCLUDE "music/pokemontower.asm" +INCLUDE "music/silphco.asm" +INCLUDE "music/meeteviltrainer.asm" +INCLUDE "music/meetfemaletrainer.asm" +INCLUDE "music/meetmaletrainer.asm" +INCLUDE "music/introbattle.asm" +INCLUDE "music/surfing.asm" +INCLUDE "music/jigglypuffsong.asm" +INCLUDE "music/halloffame.asm" +INCLUDE "music/credits.asm" SECTION "bank20",ROMX,BANK[$20] @@ -118364,25 +118364,25 @@ _UnnamedText_703ff: ; 88267 (22:4267) db $0, "#DEX Rating", $6d, $57 _UnnamedText_62453: ; 88275 (22:4275) - TX_RAM W_GYMCITYNAME + TX_RAM wGymCityName db $0, $4f db "#MON GYM", $55 db "LEADER: @" UnnamedText_8828c: ; 8828c (22:428c) - TX_RAM W_GYMLEADERNAME + TX_RAM wGymLeaderName db $0, $51 db "WINNING TRAINERS:", $4f db $53, $57 _UnnamedText_62458: ; 882a5 (22:42a5) - TX_RAM W_GYMCITYNAME + TX_RAM wGymCityName db $0, $4f db "#MON GYM", $55 db "LEADER: @" UnnamedText_882bc: ; 882bc (22:42bc) - TX_RAM W_GYMLEADERNAME + TX_RAM wGymLeaderName db $0, $51 db "WINNING TRAINERS:", $4f db $53, $55 @@ -119371,7 +119371,7 @@ _PotionText: ; 89e31 (22:5e31) TX_RAM $cd6d db $0, $4f db "recovered by @" - TX_NUM W_HPBARHPDIFFERENCE, 2, 3 + TX_NUM wHPBarHPDifference, 2, 3 db $0, "!", $57 _AntidoteText: ; 89e4b (22:5e4b) @@ -119625,7 +119625,7 @@ _UnnamedText_5d4d: ; 8a40d (22:640d) db $0, "The link was", $4f db "canceled.", $57 -INCLUDE "text/oakspeech.tx" +INCLUDE "text/oakspeech.asm" _DoYouWantToNicknameText: ; 0x8a605 db $0, "Do you want to", $4f @@ -123093,8 +123093,8 @@ _BattleCenterMText1: ; 94b01 (25:4b01) _TradeCenterMText1: ; 94b04 (25:4b04) db $0, "!", $57 -INCLUDE "text/mapRedsHouse1F.tx" -INCLUDE "text/mapBluesHouse.tx" +INCLUDE "text/mapRedsHouse1F.asm" +INCLUDE "text/mapBluesHouse.asm" _OaksLabGaryText1: ; 94d5b (25:4d5b) db $0, $53, ": Yo", $4f @@ -127576,7 +127576,7 @@ _UnnamedText_4fe44: ; a41d6 (29:41d6) db "Change the BOX at", $4f db "a #MON CENTER!", $57 -INCLUDE "text/mapPalletTown.tx" +INCLUDE "text/mapPalletTown.asm" _ViridianCityText1: ; a43cc (29:43cc) db $0, "Those # BALLs", $4f @@ -128884,7 +128884,7 @@ _UnnamedText_ef7d ; a82f8 (2a:42f8) SECTION "bank2B",ROMX,BANK[$2B] -INCLUDE "text/pokedex.tx" +INCLUDE "text/pokedex.asm" SECTION "bank2C",ROMX,BANK[$2C] |