ref: a60d16d89c257e321a86acff727299d3a74c489e
parent: 966fa8a5cff06a754bad4ec5789bc6fe9b9fdad1
parent: 47ec18ffa3c5a012b5210fecf3d1492a6fea2667
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Thu Jan 23 09:02:16 EST 2014
Merge branch 'master' of https://github.com/iimarckus/pokered
--- a/main.asm
+++ b/main.asm
@@ -172,7 +172,7 @@
GetJoypadState: ; 019a (0:019a)
ld a, [H_LOADEDROMBANK]
push af
- ld a,$3
+ ld a,Bank(_GetJoypadState)
ld [H_LOADEDROMBANK],a
ld [$2000],a
call _GetJoypadState
@@ -1205,7 +1205,7 @@
call StopMusic
ld hl,$d72e
res 5,[hl]
- ld a,$01
+ ld a,Bank(Func_40b0) ; Bank(Func_40b0) and Bank(Func_62ce) need to be equal.
ld [H_LOADEDROMBANK],a
ld [$2000],a
call Func_40b0
@@ -1236,7 +1236,7 @@
set 2,[hl]
res 5,[hl]
call DoFlyOrTeleportAwayGraphics
- ld a,$01
+ ld a,Bank(Func_62ce)
ld [H_LOADEDROMBANK],a
ld [$2000],a
call Func_62ce
@@ -2840,7 +2840,7 @@
push bc
ld c,a
ld b,$00
- ld a,$03
+ ld a,Bank(MapHeaderBanks)
call BankswitchHome ; switch to ROM bank 3
ld hl,MapHeaderBanks
add hl,bc
@@ -3044,7 +3044,7 @@
pop hl
ld a, [H_LOADEDROMBANK]
push af
- ld a, $f
+ ld a, Bank(asm_3f0d0)
ld [H_LOADEDROMBANK], a
ld [$2000], a
xor a
@@ -3176,7 +3176,7 @@
and a
jr z,.noPokemonChosen
ld a,[wCurrentMenuItem]
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld hl,W_PARTYMON1
ld b,0
ld c,a
@@ -3205,7 +3205,7 @@
jr HandlePartyMenuInput
.handleSwap
ld a,[wCurrentMenuItem]
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld b, BANK(Func_13613)
ld hl, Func_13613
call Bankswitch
@@ -3367,7 +3367,7 @@
; copy party pokemon's name to $CD6D
GetPartyMonName2: ; 15b4 (0:15b4)
- ld a,[$cf92] ; index within party
+ ld a,[wWhichPokemon] ; index within party
ld hl,W_PARTYMON1NAME
; this is called more often
@@ -5207,7 +5207,7 @@
ld bc,$007f
call FillMemory ; zero HRAM
call CleanLCD_OAM ; this is unnecessary since it was already cleared above
- ld a,$01
+ ld a,Bank(WriteDMACodeToHRAM)
ld [H_LOADEDROMBANK],a
ld [$2000],a
call WriteDMACodeToHRAM ; copy DMA code to HRAM
@@ -5266,7 +5266,7 @@
; immediately stops all sounds
StopAllSounds: ; 200e (0:200e)
- ld a, $2
+ ld a, Bank(Func_9876)
ld [$c0ef], a
ld [$c0f0], a
xor a
@@ -5300,7 +5300,7 @@
call VBlankCopyDouble
call UpdateMovingBgTiles
call $ff80 ; OAM DMA
- ld a,$01
+ ld a,Bank(PrepareOAMData)
ld [H_LOADEDROMBANK],a
ld [$2000],a
call PrepareOAMData ; update OAM buffer with current sprite data
@@ -5806,7 +5806,7 @@
ld b, a
ld a, d
and a
- ld a, $1f
+ ld a, Bank(Func_7d8ea)
jr nz, .asm_233e
ld [$c0ef], a
.asm_233e
@@ -5964,7 +5964,7 @@
ret nz
ld a, [H_LOADEDROMBANK]
push af
- ld a, $1
+ ld a, Bank(_UpdateSprites)
ld [H_LOADEDROMBANK], a
ld [$2000], a
call _UpdateSprites
@@ -6908,7 +6908,7 @@
ld [$cf94],a ; selects between subtypes of menus
ld a,[H_LOADEDROMBANK]
push af
- ld a,$01
+ ld a,Bank(DisplayPokemartDialogue_)
ld [H_LOADEDROMBANK],a
ld [$2000],a
call DisplayPokemartDialogue_
@@ -6945,7 +6945,7 @@
inc hl
ld a,[H_LOADEDROMBANK]
push af
- ld a,$01
+ ld a,Bank(DisplayPokemonCenterDialogue_)
ld [H_LOADEDROMBANK],a
ld [$2000],a
call DisplayPokemonCenterDialogue_
@@ -6991,7 +6991,7 @@
db "@"
DisplayStartMenu: ; 2acd (0:2acd)
- ld a,$04
+ ld a,$04 ; hardcoded Bank, not sure what's it refers to
ld [H_LOADEDROMBANK],a
ld [$2000],a ; ROM bank 4
ld a,[$d700] ; walking/biking/surfing
@@ -7178,10 +7178,10 @@
ld a,[W_BATTLETYPE]
and a ; is it the Old Man battle?
jr nz,.specialBattleType
- ld a,$01
+ ld a,$01 ; hardcoded bank
jr .bankswitch
.specialBattleType ; Old Man battle
- ld a,$0f
+ ld a, Bank(OldManItemList)
.bankswitch
call BankswitchHome
ld hl,$d730
@@ -7276,7 +7276,7 @@
cp c ; did the player select Cancel?
jp c,ExitListMenu ; if so, exit the menu
ld a,c
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld a,[wListMenuID]
cp a,ITEMLISTMENU
jr nz,.skipMultiplying
@@ -7318,9 +7318,9 @@
cp l ; is it a list of party pokemon or box pokemon?
ld hl,W_PARTYMON1NAME
jr z,.getPokemonName
- ld hl,$de06 ; box pokemon names
+ ld hl, W_BOXMON1NAME ; box pokemon names
.getPokemonName
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
call GetPartyMonName
.storeChosenEntry ; store the menu entry that the player chose and return
ld de,$cd6d
@@ -7541,7 +7541,7 @@
ld b,4 ; print 4 names
.loop
ld a,b
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld a,[de]
ld [$d11e],a
cp a,$ff
@@ -7566,9 +7566,9 @@
cp l ; is it a list of party pokemon or box pokemon?
ld hl,W_PARTYMON1NAME
jr z,.getPokemonName
- ld hl,$de06 ; box pokemon names
+ ld hl, W_BOXMON1NAME ; box pokemon names
.getPokemonName
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld b,a
ld a,4
sub b
@@ -7614,7 +7614,7 @@
ld a,$02
.next
ld [$cc49],a
- ld hl,$cf92
+ ld hl,wWhichPokemon
ld a,[hl]
ld b,a
ld a,$04
@@ -8728,7 +8728,7 @@
ld a, [W_ISLINKBATTLE] ; $d12b
and a
jr nz, .asm_3594
- ld a, $e
+ ld a, Bank(TrainerPicAndMoneyPointers)
call BankswitchHome
ld a, [W_TRAINERCLASS] ; $d031
dec a
@@ -8990,6 +8990,7 @@
ret
; loads sprite that de points to
+; bank of sprite is given in a
UncompressSpriteFromDE: ; 36eb (0:36eb)
ld hl, W_SPRITEINPUTPTR
ld [hl], e
@@ -9164,9 +9165,9 @@
push af
ld a, [wListMenuID] ; $cf94
cp $1
- ld a, $1
+ ld a, $1 ; hardcoded Bank
jr nz, .asm_37ed
- ld a, $f
+ ld a, $f ; hardcoded Bank
.asm_37ed
ld [H_LOADEDROMBANK], a
ld [$2000], a
@@ -9191,7 +9192,7 @@
ld [H_DOWNARROWBLINKCNT1], a ; $FF00+$8b
jr .asm_381c
.asm_3812
- ld a, $1e
+ ld a, Bank(GetMachinePrice)
ld [H_LOADEDROMBANK], a
ld [$2000], a
call GetMachinePrice
@@ -9346,7 +9347,7 @@
push bc
ld a,[H_LOADEDROMBANK]
push af
- ld a,$0d
+ ld a,Bank(_Divide)
ld [H_LOADEDROMBANK],a
ld [$2000],a
call _Divide
@@ -10496,7 +10497,7 @@
ld a, [H_CURRENTPRESSEDBUTTONS]
bit 0, a
jr z, .asm_3eea
- ld a, $11
+ ld a, Bank(Func_469a0)
ld [$2000], a
ld [H_LOADEDROMBANK], a
call Func_469a0
@@ -10618,11 +10619,11 @@
dw VermilionGymTrashSuccesText3 ; id = 3D
dw VermilionGymTrashFailText ; id = 3E
dw TownMapText ; id = 3F
- dw UnnamedText_fbe8 ; id = 40
- dw UnnamedText_fc0d ; id = 41
- dw UnnamedText_fc45 ; id = 42
+ dw BookOrSculptureText ; id = 40
+ dw ElevatorText ; id = 41
+ dw PokemonStuffText ; id = 42
-SECTION "bank1",ROMX,BANK[$1]
+SECTION "bank1",ROMX,Bank[$1]
SpriteFacingAndAnimationTable: ; 4000 (1:4000)
dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 0
@@ -10823,7 +10824,7 @@
ld [hli], a
ld [hli], a
ld [hl], a
- ld a, $1f
+ ld a, Bank(Func_7d8ea)
ld [$c0ef], a
ld [$c0f0], a
@@ -11281,12 +11282,12 @@
; $cf98 = base address of pokemon data
; $d0b8 = base address of base stats
LoadMonData_: ; 45b6 (1:45b6)
- ld a,[$da5f] ; daycare pokemon ID
+ ld a,[W_DAYCAREMONDATA] ; daycare pokemon ID
ld [$cf91],a
ld a,[$cc49]
cp a,$03
jr z,.GetMonHeader
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld e,a
ld hl, Func_39c37
ld b, BANK(Func_39c37)
@@ -11306,10 +11307,10 @@
ld hl,W_BOXMON1DATA ; box pokemon 1 data
ld bc,33
jr z,.getMonEntry
- ld hl,$da5f ; daycare pokemon data
+ ld hl, W_DAYCAREMONDATA ; daycare pokemon data
jr .copyMonData
.getMonEntry ; add the product of the index and the size of each entry
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
call AddNTimes
.copyMonData
ld de,$cf98
@@ -13547,7 +13548,7 @@
Func_57d6:
ld a, [$cc26]
- ld [$cf92], a
+ ld [wWhichPokemon], a
ld a, $36
call Predef
ld a, $37
@@ -13567,7 +13568,7 @@
ld c, $12
call Func_5ab3
ld hl, $c3a5
- ld de, $d158
+ ld de, W_PLAYERNAME
call PlaceString
ld hl, $c445
ld de, $d887
@@ -13710,7 +13711,7 @@
ld a, [hl]
ld [$cd5a], a
ld a, [$cd3d]
- ld [$cf92], a
+ ld [wWhichPokemon], a
ld hl, $d164
ld b, $0
ld c, a
@@ -13722,7 +13723,7 @@
call RemovePokemon
ld a, [$cd3e]
ld c, a
- ld [$cf92], a
+ ld [wWhichPokemon], a
ld hl, $d89d
ld d, $0
ld e, a
@@ -13739,7 +13740,7 @@
call AddEnemyMonToPlayerParty
ld a, [$d163]
dec a
- ld [$cf92], a
+ ld [wWhichPokemon], a
ld a, $1
ld [$ccd4], a
ld a, [$cd3e]
@@ -14664,7 +14665,7 @@
OakSpeech: ; 6115 (1:6115)
ld a,$FF
call PlaySound ; stop music
- ld a, BANK(Music_Routes2) ; bank of song
+ ld a, BANK(Func_9876)
ld c,a
ld a, (Music_Routes2 - $4000) / 3 ; song #
call PlayMusic ; plays music
@@ -14688,7 +14689,7 @@
bit 1,a ; XXX when is bit 1 set?
jp nz,Func_61bc ; easter egg: skip the intro
ld de,ProfOakPic
- ld bc,$1300
+ ld bc, (Bank(ProfOakPic) << 8) | $00
call IntroPredef3B ; displays Oak pic?
call FadeInIntroPic
ld hl,OakSpeechText1
@@ -14708,7 +14709,7 @@
call GBFadeOut2
call ClearScreen
ld de,RedPicFront
- ld bc,$0400 ; affects the position of the player pic
+ ld bc,(Bank(RedPicFront) << 8) | $00
call IntroPredef3B ; displays player pic?
call MovePicLeft
ld hl,IntroducePlayerText
@@ -14717,7 +14718,7 @@
call GBFadeOut2
call ClearScreen
ld de,Rival1Pic
- ld bc,$1300
+ ld bc,(Bank(Rival1Pic) << 8) | $00
call IntroPredef3B ; displays rival pic
call FadeInIntroPic
ld hl,IntroduceRivalText
@@ -14728,7 +14729,7 @@
call GBFadeOut2
call ClearScreen
ld de,RedPicFront
- ld bc,$0400
+ ld bc,(Bank(RedPicFront) << 8) | $00
call IntroPredef3B
call GBFadeIn2
ld a,[$D72D]
@@ -14747,15 +14748,15 @@
call DelayFrames
ld de,RedSprite ; $4180
ld hl,$8000
- ld bc,(BANK(RedSprite) << 8) +$0C
+ ld bc,(BANK(RedSprite) << 8) | $0C
call CopyVideoData
ld de,ShrinkPic1
- ld bc,$0400
+ ld bc,(BANK(ShrinkPic1) << 8) | $00
call IntroPredef3B
ld c,4
call DelayFrames
ld de,ShrinkPic2
- ld bc,$0400
+ ld bc,(BANK(ShrinkPic2) << 8) | $00
call IntroPredef3B
call ResetPlayerSpriteData
ld a,[H_LOADEDROMBANK]
@@ -14842,6 +14843,7 @@
Predef3B: ; 62a1 (1:62a1)
call Load16BitRegisters
IntroPredef3B: ; 62a4 (1:62a4)
+; bank of sprite given in b
push bc
ld a,b
call UncompressSpriteFromDE
@@ -16846,7 +16848,7 @@
call PrintStartMenuItem
ld de,StartMenuItemText
call PrintStartMenuItem
- ld de,$d158 ; player's name
+ ld de,W_PLAYERNAME ; player's name
call PrintStartMenuItem
ld a,[$d72e]
bit 6,a ; is the player using the link feature?
@@ -18228,7 +18230,7 @@
ld a, [$cf95]
and a
jr z, .asm_7b97
- ld hl, $dd2a
+ ld hl, W_BOXMON1OT
ld d, $13
.asm_7b97
ld a, [wWhichPokemon] ; $cf92
@@ -18247,7 +18249,7 @@
ld a, [$cf95]
and a
jr z, .asm_7bb8
- ld bc, $de06
+ ld bc, W_BOXMON1NAME
.asm_7bb8
call CopyDataUntil
ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
@@ -18267,7 +18269,7 @@
jr z, .asm_7be4
ld bc, $21
add hl, bc
- ld bc, $dd2a
+ ld bc, W_BOXMON1OT
jr .asm_7beb
.asm_7be4
ld bc, $2c
@@ -18279,7 +18281,7 @@
ld a, [$cf95]
and a
jr z, .asm_7bfa
- ld hl, $de06
+ ld hl, W_BOXMON1NAME
.asm_7bfa
ld bc, $b
ld a, [wWhichPokemon] ; $cf92
@@ -18319,7 +18321,7 @@
ld [$cc3c], a
ret
-SECTION "bank2",ROMX,BANK[$2]
+SECTION "bank2",ROMX,Bank[$2]
INCLUDE "music/headers/sfxheaders02.asm"
INCLUDE "music/headers/musicheaders02.asm"
@@ -21124,7 +21126,7 @@
ld a, $2
ld [W_SEAFOAMISLANDS4CURSCRIPT], a
jr z, .forceSurfing
- ld a, [$d35e]
+ ld a, [W_CURMAP]
cp SEAFOAM_ISLANDS_5
ld a, $2
ld [W_SEAFOAMISLANDS5CURSCRIPT], a
@@ -21825,7 +21827,7 @@
TSETHEAD Tset17_Block,Tset17_GFX,Tset17_Coll,$FF,$FF,$FF,$45,1
Func_c8de: ; c8de (3:48de)
- ld a, [$da48]
+ ld a, [W_DAYCARE_IN_USE]
and a
ret z
ld hl, $da6f
@@ -22580,7 +22582,7 @@
RemoveItemFromInventory_: ; ce74 (3:4e74)
push hl
inc hl
- ld a,[$cf92] ; index (within the inventory) of the item being removed
+ ld a,[wWhichPokemon] ; index (within the inventory) of the item being removed
sla a
add l
ld l,a
@@ -26800,7 +26802,7 @@
ld [$fff3],a
ld [$cc5b],a
ld [$d05b],a
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
push af
ld a,[$cf91]
push af
@@ -26809,7 +26811,7 @@
pop af
ld [$cf91],a
pop af
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld a,[$d11e]
cp a,$10
ld hl,ItemUseBallText00
@@ -26984,8 +26986,8 @@
ld a,[W_ISINBATTLE]
and a
jp nz,ItemUseNotTime
- ld b, BANK(Func_70e3e)
- ld hl, Func_70e3e
+ ld b, BANK(DisplayTownMap)
+ ld hl, DisplayTownMap
jp Bankswitch ; display Town Map
ItemUseBicycle: ; d977 (3:5977)
@@ -27114,7 +27116,7 @@
ld a,[W_ISINBATTLE]
and a
jp nz,ItemUseNotTime
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
push af
ld a,[$cf91]
ld [$d156],a
@@ -27140,7 +27142,7 @@
and a
jr z,.noEffect
pop af
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld hl,wNumBagItems
ld a,1 ; remove 1 stone
ld [$cf96],a
@@ -27162,7 +27164,7 @@
ld a,[W_NUMINPARTY]
and a
jp z,.emptyParty
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
push af
ld a,[$cf91]
push af
@@ -27190,9 +27192,9 @@
jp c,.canceledItemUse
ld hl,W_PARTYMON1DATA
ld bc,44
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
call AddNTimes
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld [$cf06],a
ld d,a
ld a,[$cf91]
@@ -27201,12 +27203,12 @@
pop af
ld [$cf91],a
pop af
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld a,[$d152]
and a ; using Softboiled?
jr z,.checkItemType
; if using softboiled
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
cp d ; is the pokemon trying to use softboiled on itself?
jr z,ItemUseMedicine ; if so, force another choice
.checkItemType
@@ -27372,7 +27374,7 @@
ld a,[hl]
push af
ld hl,W_PARTYMON1_MAXHP
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld bc,44
call AddNTimes
ld a,[hli]
@@ -27405,7 +27407,7 @@
ld [wHPBarNewHP+1],a
FuncCoord 4, 1 ; $c3b8
ld hl,Coord
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld bc,2 * 20
call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled
ld a,$8d
@@ -27718,7 +27720,7 @@
ld a,[$ff98]
ld [hl],a
pop hl
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
push af
ld a,[$cf91]
push af
@@ -27757,7 +27759,7 @@
call RedrawPartyMenu
pop de
ld a,d
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld a,e
ld [$d11e],a
xor a
@@ -27782,7 +27784,7 @@
pop af
ld [$cf91],a
pop af
- ld [$cf92],a
+ ld [wWhichPokemon],a
jp RemoveUsedItem
VitaminStatRoseText: ; df24 (3:5f24)
@@ -28351,8 +28353,8 @@
and a
jp nz,ItemUseNotTime
call ItemUseReloadOverworldData
- ld b,BANK(Func_7481f)
- ld hl,Func_7481f
+ ld b,BANK(HiddenItemNear)
+ ld hl,HiddenItemNear
call Bankswitch ; check for hidden items
ld hl,ItemfinderFoundNothingText
jr nc,.printText ; if no hidden items
@@ -28382,7 +28384,7 @@
jp nz,ItemUseNotTime
ItemUsePPRestore: ; e31e (3:631e)
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
push af
ld a,[$cf91]
ld [$cd3d],a
@@ -28447,12 +28449,12 @@
call PrintText
.done
pop af
- ld [$cf92],a
+ ld [wWhichPokemon],a
call GBPalWhiteOut
call GoPAL_SET_CF1C
jp RemoveUsedItem
.afterRestoringPP ; after using a (Max) Ether/Elixir
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld b,a
ld a,[wPlayerMonNumber]
cp b ; is the pokemon whose PP was restored active in battle?
@@ -28622,7 +28624,7 @@
ld [$cd6a],a ; item not used
ret
.useMachine
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
push af
ld a,[$cf91]
push af
@@ -28654,7 +28656,7 @@
ld a,$43
call Predef ; check if the pokemon can learn the move
push bc
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld hl,W_PARTYMON1NAME
call GetPartyMonName
pop bc
@@ -28677,7 +28679,7 @@
pop af
ld [$cf91],a
pop af
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld a,b
and a
ret z
@@ -28810,7 +28812,7 @@
; restores bonus PP (from PP Ups) when healing at a pokemon center
; also, when a PP Up is used, it increases the current PP by one PP Up bonus
; INPUT:
-; [$cf92] = index of pokemon in party
+; [wWhichPokemon] = index of pokemon in party
; [$d11e] = mode
; 0: Pokemon Center healing
; 1: using a PP Up
@@ -28818,7 +28820,7 @@
RestoreBonusPP: ; e606 (3:6606)
ld hl,W_PARTYMON1_MOVE1
ld bc,44
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
call AddNTimes
push hl
ld de,$cd78 - 1
@@ -28899,7 +28901,7 @@
; gets max PP of a pokemon's move (including PP from PP Ups)
; INPUT:
-; [$cf92] = index of pokemon within party/box
+; [wWhichPokemon] = index of pokemon within party/box
; [$cc49] = pokemon source
; 00: player's party
; 01: enemy's party
@@ -28970,7 +28972,7 @@
ret
GetSelectedMoveOffset: ; e6e3 (3:66e3)
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
call AddNTimes
GetSelectedMoveOffset2: ; e6e9 (3:66e9)
@@ -28984,7 +28986,7 @@
; INPUT:
; hl = address of inventory (either wNumBagItems or wNumBoxItems)
; [$cf91] = item ID
-; [$cf92] = index of item within inventory
+; [wWhichPokemon] = index of item within inventory
; [$cf96] = quantity to toss
; OUTPUT:
; clears carry flag if the item is tossed, sets carry flag if not
@@ -29020,7 +29022,7 @@
ret z
; if the player chose Yes
push hl
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
call RemoveItemFromInventory
ld a,[$cf91]
ld [$d11e],a
@@ -29119,7 +29121,7 @@
cp $ff
jr nz, .asm_e7b1
call GetMonHeader
- ld hl, $dd2a
+ ld hl, W_BOXMON1OT
ld bc, $b
ld a, [W_NUMINBOX] ; $da80
dec a
@@ -29150,13 +29152,13 @@
jr nz, .asm_e7db
.asm_e7ee
ld hl, W_PLAYERNAME ; $d158
- ld de, $dd2a
+ ld de, W_BOXMON1OT
ld bc, $b
call CopyData
ld a, [W_NUMINBOX] ; $da80
dec a
jr z, .asm_e82a
- ld hl, $de06
+ ld hl, W_BOXMON1NAME
ld bc, $b
dec a
call AddNTimes
@@ -29183,7 +29185,7 @@
dec b
jr nz, .asm_e817
.asm_e82a
- ld hl, $de06
+ ld hl, W_BOXMON1NAME
ld a, $2
ld [$d07d], a
ld a, $4e
@@ -30627,7 +30629,7 @@
ld d, h
ld e, l
ld hl, W_ENEMYMON1OT
- ld a, [$cf92]
+ ld a, [wWhichPokemon]
call SkipFixedLengthTextEntries
ld bc, $000b
call CopyData ; write new mon's OT name (from an enemy mon)
@@ -30638,7 +30640,7 @@
ld d, h
ld e, l
ld hl, W_ENEMYMON1NAME
- ld a, [$cf92]
+ ld a, [wWhichPokemon]
call SkipFixedLengthTextEntries
ld bc, $000b
call CopyData ; write new mon's nickname (from an enemy mon)
@@ -30666,7 +30668,7 @@
cp $2
jr z, .checkPartyMonSlots
cp $3
- ld hl, $da5f
+ ld hl, W_DAYCAREMONDATA
jr z, .asm_f575
ld hl, W_NUMINBOX ; $da80
ld a, [hl]
@@ -30689,7 +30691,7 @@
add hl, bc
ld a, [$cf95]
cp $2
- ld a, [$da5f]
+ ld a, [W_DAYCAREMONDATA]
jr z, .asm_f556
ld a, [$cf91]
.asm_f556
@@ -30717,7 +30719,7 @@
ld bc, W_BOXMON2DATA - W_BOXMON1DATA ; $21
jr z, .asm_f591
cp $2
- ld hl, $da5f
+ ld hl, W_DAYCAREMONDATA
jr z, .asm_f597
ld hl, W_PARTYMON1DATA ; $d16b
ld bc, W_PARTYMON2DATA - W_PARTYMON1DATA ; $2c
@@ -30746,13 +30748,13 @@
.asm_f5b4
ld a, [$cf95]
cp $3
- ld de, $da54
+ ld de, W_DAYCAREMONOT
jr z, .asm_f5d3
dec a
ld hl, W_PARTYMON1OT ; $d273
ld a, [W_NUMINPARTY] ; $d163
jr nz, .asm_f5cd
- ld hl, $dd2a
+ ld hl, W_BOXMON1OT
ld a, [W_NUMINBOX] ; $da80
.asm_f5cd
dec a
@@ -30760,11 +30762,11 @@
ld d, h
ld e, l
.asm_f5d3
- ld hl, $dd2a
+ ld hl, W_BOXMON1OT
ld a, [$cf95]
and a
jr z, .asm_f5e6
- ld hl, $da54
+ ld hl, W_DAYCAREMONOT
cp $2
jr z, .asm_f5ec
ld hl, W_PARTYMON1OT ; $d273
@@ -30776,13 +30778,13 @@
call CopyData
ld a, [$cf95]
cp $3
- ld de, $da49
+ ld de, W_DAYCAREMONNAME
jr z, .asm_f611
dec a
ld hl, W_PARTYMON1NAME ; $d2b5
ld a, [W_NUMINPARTY] ; $d163
jr nz, .asm_f60b
- ld hl, $de06
+ ld hl, W_BOXMON1NAME
ld a, [W_NUMINBOX] ; $da80
.asm_f60b
dec a
@@ -30790,11 +30792,11 @@
ld d, h
ld e, l
.asm_f611
- ld hl, $de06
+ ld hl, W_BOXMON1NAME
ld a, [$cf95]
and a
jr z, .asm_f624
- ld hl, $da49
+ ld hl, W_DAYCAREMONNAME
cp $2
jr z, .asm_f62a
ld hl, W_PARTYMON1NAME ; $d2b5
@@ -30966,7 +30968,7 @@
jr .HealPokemon ; Next Pokémon
.DoneHealing
xor a
- ld [$cf92], a
+ ld [wWhichPokemon], a
ld [$d11e], a
ld a, [W_NUMINPARTY]
ld b, a
@@ -30974,7 +30976,7 @@
push bc
call RestoreBonusPP
pop bc
- ld hl, $cf92
+ ld hl, wWhichPokemon
inc [hl]
dec b
jr nz,.restoreBonusPPLoop
@@ -31797,9 +31799,9 @@
TX_FAR _IndigoPlateauStatuesText3
db "@"
-UnnamedText_fbe8: ; fbe8 (3:7be8)
+BookOrSculptureText: ; fbe8 (3:7be8)
db $08 ; asm
- ld hl, UnnamedText_fc03
+ ld hl, PokemonBooksText
ld a, [W_CURMAPTILESET]
cp $13 ; Celadon Mansion tileset
jr nz, .asm_fbfd
@@ -31806,21 +31808,21 @@
ld a, [$c420]
cp $38
jr nz, .asm_fbfd
- ld hl, UnnamedText_fc08
+ ld hl, DiglettSculptureText
.asm_fbfd
call PrintText
jp TextScriptEnd
-UnnamedText_fc03: ; fc03 (3:7c03)
- TX_FAR _UnnamedText_fc03
+PokemonBooksText: ; fc03 (3:7c03)
+ TX_FAR _PokemonBooksText
db "@"
-UnnamedText_fc08: ; fc08 (3:7c08)
- TX_FAR _UnnamedText_fc08
+DiglettSculptureText: ; fc08 (3:7c08)
+ TX_FAR _DiglettSculptureText
db "@"
-UnnamedText_fc0d: ; fc0d (3:7c0d)
- TX_FAR _UnnamedText_fc0d
+ElevatorText: ; fc0d (3:7c0d)
+ TX_FAR _ElevatorText
db "@"
TownMapText: ; fc12 (3:7c12)
@@ -31837,8 +31839,8 @@
inc a
ld [H_AUTOBGTRANSFERENABLED], a
call LoadFontTilePatterns
- ld b, BANK(Func_70e3e)
- ld hl, Func_70e3e
+ ld b, BANK(DisplayTownMap)
+ ld hl, DisplayTownMap
call Bankswitch
ld hl, $d730
res 6, [hl]
@@ -31848,8 +31850,8 @@
push af
jp CloseTextDisplay
-UnnamedText_fc45: ; fc45 (3:7c45)
- TX_FAR _UnnamedText_fc45
+PokemonStuffText: ; fc45 (3:7c45)
+ TX_FAR _PokemonStuffText
db "@"
SECTION "bank4",ROMX,BANK[$4]
@@ -32123,7 +32125,7 @@
ld hl, Coord
ld a, $4b
call Predef ; Prints the type (?)
- ld hl, Unknown_12a9d ; $6a9d
+ ld hl, NamePointers2 ; $6a9d
call .unk_12a7e
ld d, h
ld e, l
@@ -32130,7 +32132,7 @@
FuncCoord 9,1
ld hl, Coord
call PlaceString ; Pokémon name
- ld hl, Unknown_12a95 ; $6a95
+ ld hl, OTPointers ; $6a95
call .unk_12a7e
ld d, h
ld e, l
@@ -32170,17 +32172,17 @@
ld a, [wWhichPokemon]
jp SkipFixedLengthTextEntries
-Unknown_12a95: ; 12a95 (4:6a95)
+OTPointers: ; 12a95 (4:6a95)
dw W_PARTYMON1OT
dw W_ENEMYMON1OT
- dw $DD2A
- dw $DA54
+ dw W_BOXMON1OT
+ dw W_DAYCAREMONOT
-Unknown_12a9d: ; 12a9d (4:6a9d)
+NamePointers2: ; 12a9d (4:6a9d)
dw W_PARTYMON1NAME
dw W_ENEMYMON1NAME
- dw $DE06
- dw $DA49
+ dw W_BOXMON1NAME
+ dw W_DAYCAREMONNAME
Type1Text: ; 12aa5 (4:6aa5)
db "TYPE1/", $4e
@@ -32539,7 +32541,7 @@
ld hl, Func_71868
call Bankswitch ; place the appropriate pokemon icon
ld a,[$FF8C] ; loop counter
- ld [$CF92],a
+ ld [wWhichPokemon],a
inc a
ld [$FF8C],a
call LoadMonData
@@ -32551,7 +32553,7 @@
; if the player is swapping pokemon positions
dec a
ld b,a
- ld a,[$CF92]
+ ld a,[wWhichPokemon]
cp b ; is the player swapping the current pokemon in the list?
jr nz,.skipUnfilledRightArrow
; the player is swapping the current pokemon in the list
@@ -32955,7 +32957,7 @@
jp StartMenu_Pokemon
.choseOutOfBattleMove
push hl
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld hl,W_PARTYMON1NAME
call GetPartyMonName
pop hl
@@ -32986,7 +32988,7 @@
jp z,.newBadgeRequired
call CheckIfInOutsideMap
jr z,.canFly
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld hl,W_PARTYMON1NAME
call GetPartyMonName
ld hl,.cannotFlyHereText
@@ -33061,7 +33063,7 @@
.teleport
call CheckIfInOutsideMap
jr z,.canTeleport
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld hl,W_PARTYMON1NAME
call GetPartyMonName
ld hl,.cannotUseTeleportNowText
@@ -33091,7 +33093,7 @@
db "@"
.softboiled
ld hl,W_PARTYMON1_MAXHP
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld bc,44
call AddNTimes
ld a,[hli]
@@ -39188,7 +39190,7 @@
dw Func_1a56b
Func_1a514: ; 1a514 (6:6514)
- ld a, $2
+ ld a, Bank(Func_9876)
ld [$c0ef], a
ld [$c0f0], a
ld a, $e1
@@ -39245,7 +39247,7 @@
dw Func_1a56b
Func_1a581: ; 1a581 (6:6581)
- ld a, $2
+ ld a, Bank(Func_9876)
ld [$c0ef], a
ld [$c0f0], a
ld a, $e1
@@ -40674,7 +40676,7 @@
.GotParcel
ld hl, $d31d
ld a, c
- ld [$cf92], a
+ ld [wWhichPokemon], a
ld a, $1
ld [$cf96], a
jp RemoveItemFromInventory
@@ -42116,15 +42118,15 @@
Func_1da20: ; 1da20 (7:5a20)
ld hl, W_PARTYMON1OT
ld bc, $000b
- ld a, [$cf92]
+ ld a, [wWhichPokemon]
call AddNTimes
- ld de, $d158
+ ld de, W_PLAYERNAME
ld c, $b
call .asm_1da47
jr c, .asm_1da52 ; 0x1da34 $1c
ld hl, $d177
ld bc, $002c
- ld a, [$cf92]
+ ld a, [wWhichPokemon]
call AddNTimes
ld de, $d359
ld c, $2
@@ -45024,7 +45026,7 @@
call Func_2174b
jp nc, Func_214e8
ld a, [wWhichPokemon] ; $cf92
- ld hl, $de06
+ ld hl, W_BOXMON1NAME
call GetPartyMonName
ld a, [$cf91]
call GetCryData
@@ -45103,7 +45105,7 @@
ld hl, $da9e
ld bc, $0021
.asm_21729
- ld a, [$cf92]
+ ld a, [wWhichPokemon]
call AddNTimes
ld b, $4
.asm_21731
@@ -45265,7 +45267,7 @@
ld a, [$c109]
cp $c
ret nz
- ld a, [$d35e]
+ ld a, [W_CURMAP]
cp $ef
ld a, $2
jr z, .asm_2183a
@@ -45283,7 +45285,7 @@
ld a, [$c109]
cp $8
ret nz
- ld a, [$d35e]
+ ld a, [W_CURMAP]
cp $ef
ld a, $2
jr z, .asm_2185a
@@ -48417,7 +48419,7 @@
ld b, a
ld hl, DisplayTextIDInit
call Bankswitch
- ld hl, UnnamedText_37390
+ ld hl, PlaySlotMachineText
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
@@ -48465,8 +48467,8 @@
push af
jp CloseTextDisplay
-UnnamedText_37390: ; 37390 (d:7390)
- TX_FAR _UnnamedText_37390
+PlaySlotMachineText: ; 37390 (d:7390)
+ TX_FAR _PlaySlotMachineText
db "@"
Func_37395: ; 37395 (d:7395)
@@ -48476,7 +48478,7 @@
ld [hli], a
ld [hl], a
call Func_3775f
- ld hl, UnnamedText_3746c
+ ld hl, BetHowManySlotMachineText
call PrintText
call SaveScreenTilesToBuffer1
.loop
@@ -48497,7 +48499,7 @@
ld c, $4
call TextBoxBorder
ld hl, $c4a0
- ld de, UnnamedText_3745e
+ ld de, CoinMultiplierSlotMachineText
call PlaceString
call HandleMenuInput
and $2
@@ -48515,7 +48517,7 @@
ld a, [hl]
cp c
jr nc, .skip1
- ld hl, UnnamedText_37476
+ ld hl, NotEnoughCoinsSlotMachineText
call PrintText
jr .loop
.skip1
@@ -48531,7 +48533,7 @@
call WaitForSoundToFinish
ld a, $c0
call PlaySound
- ld hl, UnnamedText_37471
+ ld hl, StartSlotMachineText
call PrintText
call Func_374ad
call Func_37588
@@ -48539,12 +48541,12 @@
ld a, [hli]
or [hl]
jr nz, .skip2
- ld hl, UnnamedText_37467
+ ld hl, OutOfCoinsSlotMachineText
call PrintText
ld c, $3c
jp DelayFrames
.skip2
- ld hl, UnnamedText_3747b
+ ld hl, OneMoreGoSlotMachineText
call PrintText
ld hl, $c49e
ld bc, $0d0f
@@ -48559,29 +48561,29 @@
call Func_377ce
jp Func_37395
-UnnamedText_3745e: ; 3745e (d:745e)
+CoinMultiplierSlotMachineText: ; 3745e (d:745e)
db "×3",$4e
db "×2",$4e
db "×1@"
-UnnamedText_37467: ; 37467 (d:7467)
- TX_FAR _UnnamedText_37467
+OutOfCoinsSlotMachineText: ; 37467 (d:7467)
+ TX_FAR _OutOfCoinsSlotMachineText
db "@"
-UnnamedText_3746c: ; 3746c (d:746c)
- TX_FAR _UnnamedText_3746c
+BetHowManySlotMachineText: ; 3746c (d:746c)
+ TX_FAR _BetHowManySlotMachineText
db "@"
-UnnamedText_37471: ; 37471 (d:7471)
- TX_FAR _UnnamedText_37471
+StartSlotMachineText: ; 37471 (d:7471)
+ TX_FAR _StartSlotMachineText
db "@"
-UnnamedText_37476: ; 37476 (d:7476)
- TX_FAR _UnnamedText_37476
+NotEnoughCoinsSlotMachineText: ; 37476 (d:7476)
+ TX_FAR _NotEnoughCoinsSlotMachineText
db "@"
-UnnamedText_3747b: ; 3747b (d:747b)
- TX_FAR _UnnamedText_3747b
+OneMoreGoSlotMachineText: ; 3747b (d:747b)
+ TX_FAR _OneMoreGoSlotMachineText
db "@"
Func_37480: ; 37480 (d:7480)
@@ -62239,7 +62241,7 @@
jr nz,.next
ld a,[$CC3E]
sub 4
- ld [$CF92],a
+ ld [wWhichPokemon],a
jr .next3
.next
ld b,$FF
@@ -62250,7 +62252,7 @@
jr z,.next2
ld hl,$D8A4
ld a,b
- ld [$CF92],a
+ ld [wWhichPokemon],a
push bc
ld bc,$2C
call AddNTimes
@@ -62262,13 +62264,13 @@
or c
jr z,.next2
.next3
- ld a,[$CF92]
+ ld a,[wWhichPokemon]
ld hl,$D8C5
ld bc,$2C
call AddNTimes
ld a,[hl]
ld [$D127],a
- ld a,[$CF92]
+ ld a,[wWhichPokemon]
inc a
ld hl,$D89C
ld c,a
@@ -62316,7 +62318,7 @@
ld [$CC26],a
jr c,.next7
ld hl,$CC2F
- ld a,[$CF92]
+ ld a,[wWhichPokemon]
cp [hl]
jr nz,.next6
ld hl,UnnamedText_3d1f5 ; $51f5
@@ -63122,24 +63124,24 @@
.asm_3d01a
ld a, [W_BATTLETYPE] ; $d05a
dec a
- jr nz, .asm_3d031
- ld hl, .list
+ jr nz, Func_3d031
+ ld hl, OldManItemList
ld a, l
ld [$cf8b], a
ld a, h
ld [$cf8c], a
- jr .asm_3d03c
+ jr Func_3d03c
-.list
- db $01, $04, $32, $ff
+OldManItemList: ; 3d02d (f:502d)
+ db $01, POKE_BALL, 50, $ff
-.asm_3d031
+Func_3d031
ld hl, wNumBagItems ; $d31d
ld a, l
ld [$cf8b], a
ld a, h
ld [$cf8c], a
-.asm_3d03c
+Func_3d03c
xor a
ld [$cf93], a
ld a, $3
@@ -71774,7 +71776,7 @@
ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
ret
-Func_41191: ; 41191 (10:5191)
+Delay50: ; 41191 (10:5191)
ld c, $50
jp DelayFrames
@@ -71887,7 +71889,7 @@
dec a
and a
jr nz, .asm_41273
- call Func_41191
+ call Delay50
ld a, $ad
call Func_41676
ld a, $aa
@@ -72393,10 +72395,10 @@
Func_41611: ; 41611 (10:5611)
ld hl, UnnamedText_41623 ; $5623
call PrintText
- call Func_41191
+ call Delay50
ld hl, UnnamedText_41628 ; $5628
call PrintText
- jp Func_41191
+ jp Delay50
UnnamedText_41623: ; 41623 (10:5623)
TX_FAR _UnnamedText_41623
@@ -72409,10 +72411,10 @@
Func_4162d: ; 4162d (10:562d)
ld hl, UnnamedText_41642 ; $5642
call PrintText
- call Func_41191
+ call Delay50
ld hl, UnnamedText_41647 ; $5647
call PrintText
- call Func_41191
+ call Delay50
jp Func_415df
UnnamedText_41642: ; 41642 (10:5642)
@@ -72426,7 +72428,7 @@
Func_4164c: ; 4164c (10:564c)
ld hl, UnnamedText_41655 ; $5655
call PrintText
- jp Func_41191
+ jp Delay50
UnnamedText_41655: ; 41655 (10:5655)
TX_FAR _UnnamedText_41655
@@ -72435,10 +72437,10 @@
Func_4165a: ; 4165a (10:565a)
ld hl, UnnamedText_4166c
call PrintText
- call Func_41191
+ call Delay50
ld hl, UnnamedText_41671
call PrintText
- jp Func_41191
+ jp Delay50
UnnamedText_4166c: ; 4166c (10:566c)
TX_FAR _UnnamedText_4166c
@@ -72783,7 +72785,7 @@
ld c, $28
call DelayFrames
.asm_418d0
- ld a, $1f
+ ld a, Bank(Func_7d8ea)
ld [$c0ef], a
ld [$c0f0], a
ld a, $dc
@@ -73402,7 +73404,7 @@
Mansion1Text4: ; 4435a (11:435a)
db $8
- ld hl, UnnamedText_44395
+ ld hl, MansionSwitchText
call PrintText
call YesNoChoice
ld a, [$cc26]
@@ -73412,7 +73414,7 @@
ld [$cc3c], a
ld hl, $d126
set 5, [hl]
- ld hl, UnnamedText_4439a
+ ld hl, MansionSwitchPressedText
call PrintText
ld a, $ad
call PlaySound
@@ -73423,21 +73425,21 @@
res 0, [hl]
jr .asm_44392 ; 0x4438a $6
.asm_4438c
- ld hl, UnnamedText_4439f
+ ld hl, MansionSwitchNotPressedText
call PrintText
.asm_44392
jp TextScriptEnd
-UnnamedText_44395: ; 44395 (11:4395)
- TX_FAR _UnnamedText_44395
+MansionSwitchText: ; 44395 (11:4395)
+ TX_FAR _MansionSwitchText
db "@"
-UnnamedText_4439a: ; 4439a (11:439a)
- TX_FAR _UnnamedText_4439a
+MansionSwitchPressedText: ; 4439a (11:439a)
+ TX_FAR _MansionSwitchPressedText
db "@"
-UnnamedText_4439f: ; 4439f (11:439f)
- TX_FAR _UnnamedText_4439f
+MansionSwitchNotPressedText: ; 4439f (11:439f)
+ TX_FAR _MansionSwitchNotPressedText
db "@"
Mansion1Object: ; 0x443a4 (size=90)
@@ -89929,7 +89931,7 @@
DayCareMText1: ; 56254 (15:6254)
db $8
call SaveScreenTilesToBuffer2
- ld a, [$da48]
+ ld a, [W_DAYCARE_IN_USE]
and a
jp nz, Func_562e1
ld hl, UnnamedText_5640f
@@ -89964,13 +89966,13 @@
jp c, Func_56409
xor a
ld [$cc2b], a
- ld a, [$cf92]
+ ld a, [wWhichPokemon]
ld hl, $d2b5
call GetPartyMonName
ld hl, UnnamedText_56419
call PrintText
ld a, $1
- ld [$da48], a
+ ld [W_DAYCARE_IN_USE], a
ld a, $3
ld [$cf95], a
call Func_3a68
@@ -89984,7 +89986,7 @@
Func_562e1: ; 562e1 (15:62e1)
xor a
- ld hl, $da49
+ ld hl, W_DAYCAREMONNAME
call GetPartyMonName
ld a, $3
ld [$cc49], a
@@ -90078,7 +90080,7 @@
.asm_56396
xor a
- ld [$da48], a
+ ld [W_DAYCARE_IN_USE], a
ld hl, wTrainerEngageDistance
ld [hli], a
inc hl
@@ -90096,7 +90098,7 @@
ld a, $2
ld [$cf95], a
call Func_3a68
- ld a, [$da5f]
+ ld a, [W_DAYCAREMONDATA]
ld [$cf91], a
ld a, [W_NUMINPARTY]
dec a
@@ -90557,7 +90559,7 @@
jr nz, .asm_56715 ; 0x56725 $ee
FuncCoord 10, 4 ; $c3fa
ld hl, Coord
- ld de, $d158
+ ld de, W_PLAYERNAME
call PlaceString
ld b, BANK(Func_44dd)
ld hl, Func_44dd
@@ -90593,7 +90595,7 @@
jp GBPalNormal
Func_56777: ; 56777 (15:6777)
- ld hl, $d158
+ ld hl, W_PLAYERNAME
ld bc, $ff00
.asm_5677d
ld a, [hli]
@@ -101268,7 +101270,7 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld a, $2
+ ld a, Bank(Func_9876)
ld [$c0ef], a
.asm_61908
ld a, $e8
@@ -103449,7 +103451,7 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld a, $2
+ ld a, Bank(Func_9876)
ld [$c0ef], a
.asm_70495
ld a, $e8
@@ -104945,7 +104947,7 @@
Unknown_70e2e: ; 70e2e (1c:4e2e)
db $04,$00,$03,$00,$03,$00,$02,$00,$02,$00,$01,$00,$01,$00,$01,$FF
-Func_70e3e: ; 70e3e (1c:4e3e)
+DisplayTownMap: ; 70e3e (1c:4e3e)
call Func_7109b
ld hl, $cfcb
ld a, [hl]
@@ -106399,7 +106401,7 @@
cp b
ld a,$2
jr nz,.asm_c4bc2 ; 0x71c26 $75
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
ld hl,$d18c
ld bc,$002c
call AddNTimes
@@ -106413,7 +106415,7 @@
call Predef
ld hl, UnnamedText_71d88
call PrintText
- ld a,[$cf92]
+ ld a,[wWhichPokemon]
push af
ld a,[$d127]
push af
@@ -106424,7 +106426,7 @@
pop af
ld [$d127],a
pop af
- ld [$cf92],a
+ ld [wWhichPokemon],a
ld a,[$cd34]
ld [$cf91],a
xor a
@@ -109061,14 +109063,14 @@
ld [hl], "R"
ret
-Func_7481f: ; 7481f (1d:481f)
+HiddenItemNear: ; 7481f (1d:481f)
ld hl, HiddenItemCoords
ld b, $0
.asm_74824
ld de, $0003
- ld a, [$d35e]
+ ld a, [W_CURMAP]
call IsInArrayCummulativeCount
- ret nc
+ ret nc ; return if current map has no hidden items
push bc
push hl
ld hl, $d6f0
@@ -109075,7 +109077,7 @@
ld c, b
ld b, $2
ld a, $10
- call Predef
+ call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, c
pop hl
pop bc
@@ -111241,7 +111243,7 @@
dw CinnabarGymText7
dw CinnabarGymText8
dw CinnabarGymText9
- dw UnnamedText_75925
+ dw BlaineBadgeText
dw ReceivedTM38Text
dw TM38NoRoomText
@@ -111276,35 +111278,35 @@
call DisableWaitingAfterTextDisplay
jp TextScriptEnd
.asm_3012f ; 0x758f4
- ld hl, UnnamedText_75920
+ ld hl, BlaineFireBlastText
call PrintText
jp TextScriptEnd
.asm_d9332 ; 0x758fd
- ld hl, UnnamedText_75914
+ ld hl, BlaineBattleText
call PrintText
- ld hl, UnnamedText_75919
- ld de, UnnamedText_75919 ; $5919 XXX
+ ld hl, BlaineEndBattleText
+ ld de, BlaineEndBattleText
call PreBattleSaveRegisters
ld a, $7
ld [$d05c], a
jp Func_758b7
-UnnamedText_75914: ; 75914 (1d:5914)
- TX_FAR _UnnamedText_75914
+BlaineBattleText: ; 75914 (1d:5914)
+ TX_FAR _BlaineBattleText
db "@"
-UnnamedText_75919: ; 75919 (1d:5919)
- TX_FAR UnnamedText_a08c7
+BlaineEndBattleText: ; 75919 (1d:5919)
+ TX_FAR _BlaineEndBattleText
db $11
db $d
db "@"
-UnnamedText_75920: ; 75920 (1d:5920)
- TX_FAR _UnnamedText_75920
+BlaineFireBlastText: ; 75920 (1d:5920)
+ TX_FAR _BlaineFireBlastText
db "@"
-UnnamedText_75925: ; 75925 (1d:5925)
- TX_FAR _UnnamedText_75925
+BlaineBadgeText: ; 75925 (1d:5925)
+ TX_FAR _BlaineBadgeText
db "@"
ReceivedTM38Text: ; 7592a (1d:592a)
@@ -116039,6 +116041,7 @@
.asm_79d26
ld [$d08a], a
ret
+
Func_79d2a: ; 79d2a (1e:5d2a)
ld hl, $c301
ld de, Unknown_79d3e
@@ -116509,7 +116512,7 @@
dw DragonRageAnim
dw FireSpinAnim
dw ThunderShockAnim
- dw ThunderBoldAnim
+ dw ThunderBoltAnim
dw ThunderWaveAnim
dw ThunderAnim
dw RockThrowAnim
@@ -117090,7 +117093,7 @@
db $42,$53,$29
db $FF
-ThunderBoldAnim: ; 7a470 (1e:6470)
+ThunderBoltAnim: ; 7a470 (1e:6470)
db $41,$54,$29
db $41,$54,$29
db $FF
@@ -118704,8 +118707,8 @@
dw FrameBlock45
dw FrameBlock46
dw FrameBlock47
- dw FrameBlock48
- dw FrameBlock49
+ dw SmallBlackCircleFrameBlock
+ dw LargeBlockCircleFrameBlock
dw FrameBlock4a
dw FrameBlock4b
dw FrameBlock4c
@@ -118755,6 +118758,14 @@
dw FrameBlock78
dw FrameBlock79
+; FrameBlock format is as follows:
+; first byte = number of tiles in FrameBlock
+;
+; Next, each group of 4 bytes describes a tile in the FrameBlock
+; first byte = y offset
+; second byte = x offset
+; third byte = tile id (it's actually tile id - $31)
+; fourth byte = tile properties (xflip/yflip/etc.)
FrameBlock01: ; 7b068 (1e:7068)
db $09
db $00,$00,$2c,$00
@@ -119400,7 +119411,7 @@
db $08,$00,$43,$40
db $08,$08,$43,$60
-FrameBlock48: ; 7b764 (1e:7764)
+SmallBlackCircleFrameBlock: ; 7b764 (1e:7764)
db $04
db $08,$08,$33,$00
db $08,$10,$33,$20
@@ -119407,7 +119418,7 @@
db $10,$08,$33,$40
db $10,$10,$33,$60
-FrameBlock49: ; 7b775 (1e:7775)
+LargeBlockCircleFrameBlock: ; 7b775 (1e:7775)
db $10
db $00,$00,$22,$00
db $00,$08,$23,$00
@@ -124859,26 +124870,26 @@
TX_RAM $cf4b
db $0, ".", $57
-_UnnamedText_37390: ; 8818f (22:418f)
+_PlaySlotMachineText: ; 8818f (22:418f)
db $0, "A slot machine!", $4f
db "Want to play?", $57
-_UnnamedText_37467: ; 881ae (22:41ae)
+_OutOfCoinsSlotMachineText: ; 881ae (22:41ae)
db $0, "Darn!", $4f
db "Ran out of coins!", $57
-_UnnamedText_3746c: ; 881c7 (22:41c7)
+_BetHowManySlotMachineText: ; 881c7 (22:41c7)
db $0, "Bet how many", $4f
db "coins?", $57
-_UnnamedText_37471: ; 881dc (22:41dc)
+_StartSlotMachineText: ; 881dc (22:41dc)
db $0, "Start!", $57
-_UnnamedText_37476: ; 881e4 (22:41e4)
+_NotEnoughCoinsSlotMachineText: ; 881e4 (22:41e4)
db $0, "Not enough", $4f
db "coins!", $58
-_UnnamedText_3747b: ; 881f7 (22:41f7)
+_OneMoreGoSlotMachineText: ; 881f7 (22:41f7)
db $0, "One more ", $4f
db "go?", $57
@@ -125437,15 +125448,15 @@
db "#MON authority", $55
db "#MON LEAGUE HQ", $57
-_UnnamedText_fc03: ; 895c1 (22:55c1)
+_PokemonBooksText: ; 895c1 (22:55c1)
db $0, "Crammed full of", $4f
db "#MON books!", $57
-_UnnamedText_fc08: ; 895de (22:55de)
+_DiglettSculptureText: ; 895de (22:55de)
db $0, "It's a sculpture", $4f
db "of DIGLETT.", $57
-_UnnamedText_fc0d: ; 895fb (22:55fb)
+_ElevatorText: ; 895fb (22:55fb)
db $0, "This is an", $4f
db "elevator.", $57
@@ -125452,7 +125463,7 @@
_TownMapText: ; 89611 (22:5611)
db $0, "A TOWN MAP.@@"
-_UnnamedText_fc45: ; 8961f (22:561f)
+_PokemonStuffText: ; 8961f (22:561f)
db $0, "Wow! Tons of", $4f
db "#MON stuff!", $57
@@ -126391,7 +126402,7 @@
db "@"
UnnamedText_8acb6: ; 8acb6 (22:6cb6)
- TX_RAM $da49
+ TX_RAM W_DAYCAREMONNAME
db $0, " back!", $57
_UnnamedText_56432: ; 8acc1 (22:6cc1)
@@ -133014,17 +133025,17 @@
db "know what you're", $55
db "talking about.", $57
-_UnnamedText_44395: ; a080a (28:480a)
+_MansionSwitchText: ; a080a (28:480a)
db $0, "A secret switch!", $51
db "Press it?", $57
-_UnnamedText_4439a: ; a0826 (28:4826)
+_MansionSwitchPressedText: ; a0826 (28:4826)
db $0, "Who wouldn't?", $58
-_UnnamedText_4439f: ; a0834 (28:4834)
+_MansionSwitchNotPressedText: ; a0834 (28:4834)
db $0, "Not quite yet!", $57
-_UnnamedText_75914: ; a0844 (28:4844)
+_BlaineBattleText: ; a0844 (28:4844)
db $0, "Hah!", $51
db "I am BLAINE! I", $4f
db "am the LEADER of", $55
@@ -133035,13 +133046,13 @@
db "Hah! You better", $4f
db "have BURN HEAL!", $57
-UnnamedText_a08c7: ; a08c7 (28:48c7)
+_BlaineEndBattleText: ; a08c7 (28:48c7)
db $0, "I have", $4f
db "burnt out!", $51
db "You have earned", $4f
db "the VOLCANOBADGE!@@"
-_UnnamedText_75920: ; a08fd (28:48fd)
+_BlaineFireBlastText: ; a08fd (28:48fd)
db $0, "FIRE BLAST is the", $4f
db "ultimate fire", $55
db "technique!", $51
@@ -133048,7 +133059,7 @@
db "Don't waste it on", $4f
db "water #MON!", $57
-_UnnamedText_75925: ; a0946 (28:4946)
+_BlaineBadgeText: ; a0946 (28:4946)
db $0, "Hah!", $51
db "The VOLCANOBADGE", $4f
db "heightens the", $55
@@ -134110,7 +134121,7 @@
db $0, "There's no more", $4f
db "room for #MON!", $55
db "@"
- TX_RAM $de06
+ TX_RAM W_BOXMON1NAME
db $0, " was", $55
db "sent to #MON", $55
db "BOX @"
@@ -135105,7 +135116,7 @@
_ItemUseBallText07: ; a67ee (29:67ee)
db 1
- dw $DE06
+ dw W_BOXMON1NAME
db 0," was",$4F
db "transferred to",$55
db "BILL's PC!",$58
@@ -135112,7 +135123,7 @@
_ItemUseBallText08: ; a6810 (29:6810)
db 1
- dw $DE06
+ dw W_BOXMON1NAME
db 0," was",$4F
db "transferred to",$55
db "someone's PC!",$58
--- a/wram.asm
+++ b/wram.asm
@@ -1421,8 +1421,20 @@
W_NUMSAFARIBALLS: ; da47
ds 1
- ds 56
+W_DAYCARE_IN_USE: ; da48
+; 0 if no pokemon is in the daycare
+; 1 if pokemon is in the daycare
+ ds 1
+W_DAYCAREMONNAME: ; da49
+ ds 11
+
+W_DAYCAREMONOT: ; da54
+ ds 11
+
+W_DAYCAREMONDATA: ; da5f
+ ds 33
+
W_NUMINBOX: ; da80
; number of mons in current box
ds 22
@@ -1432,5 +1444,14 @@
W_BOXMON2DATA: ; dab7
ds 33 * 19
-; dd2a
+W_BOXMON1OT: ; dd2a
+ ds 11
+W_BOXMON2OT: ; dd35
+ ds 11 * 19
+W_BOXMON1NAME: ; de06
+ ds 11
+W_BOXMON2NAME: ; de11
+ ds 11 * 19
+
+; dee2
--
⑨