diff options
Diffstat (limited to 'engine/menu')
| -rw-r--r-- | engine/menu/bills_pc.asm | 22 | ||||
| -rwxr-xr-x | engine/menu/diploma.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/league_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/main_menu.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/naming_screen.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/party_menu.asm | 6 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 34 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 12 |
8 files changed, 43 insertions, 43 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index bfcdcb9b..e48f6bd3 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -44,7 +44,7 @@ Func_213c8:: ; 213c8 (8:53c8) call PlaceString FuncCoord 2, 4 ld hl, Coord - ld de, W_PLAYERNAME ; wd158 + ld de, wPlayerName ; wd158 call PlaceString ld l, c ld h, b @@ -232,7 +232,7 @@ Func_21588: ; 21588 (8:5588) Func_215ac: ; 215ac (8:55ac) BillsPCDeposit: - ld a, [W_NUMINPARTY] ; W_NUMINPARTY + ld a, [wPartyCount] ; wPartyCount dec a jr nz, .asm_215bb ld hl, CantDepositLastMonText @@ -246,7 +246,7 @@ BillsPCDeposit: call PrintText jp BillsPCMenu .asm_215cb - ld hl, W_NUMINPARTY ; W_NUMINPARTY + ld hl, wPartyCount ; wPartyCount call Func_216be jp c, BillsPCMenu call Func_2174b @@ -288,7 +288,7 @@ Func_21618: ; 21618 (8:5618) call PrintText jp Func_214e8 .asm_21627 - ld a, [W_NUMINPARTY] ; W_NUMINPARTY + ld a, [wPartyCount] ; wPartyCount cp $6 jr nz, .asm_21637 ld hl, CantTakeMonText ; $5811 @@ -301,7 +301,7 @@ Func_21618: ; 21618 (8:5618) call Func_2174b jp nc, Func_214e8 ld a, [wWhichPokemon] ; wWhichPokemon - ld hl, W_BOXMON1NAME + ld hl, wBoxMonNicks call GetPartyMonName ld a, [wcf91] call GetCryData @@ -372,21 +372,21 @@ BoxNoPCText: ; 21713 (8:5713) db "BOX No.@" Func_2171b:: ; 2171b (8:571b) - ld hl, W_PARTYMON1_MOVE1 - ld bc, $002c + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 jr .asm_21729 ; 0x21721 $6 - ld hl, wda9e - ld bc, $0021 + ld hl, wBoxMon1Moves + ld bc, wBoxMon2 - wBoxMon1 .asm_21729 ld a, [wWhichPokemon] call AddNTimes - ld b, $4 + ld b, NUM_MOVES .asm_21731 ld a, [hli] push hl push bc ld hl, HMMoveArray ; $5745 - ld de, $0001 + ld de, 1 call IsInArray pop bc pop hl diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 58b613c5..e31e31aa 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -36,7 +36,7 @@ DisplayDiploma: ; 566e2 (15:66e2) jr nz, .asm_56715 ; 0x56725 $ee FuncCoord 10, 4 ld hl, Coord - ld de, W_PLAYERNAME + ld de, wPlayerName call PlaceString callba Func_44dd ld hl, wOAMBuffer + $01 @@ -68,7 +68,7 @@ DisplayDiploma: ; 566e2 (15:66e2) jp GBPalNormal Func_56777: ; 56777 (15:6777) - ld hl, W_PLAYERNAME + ld hl, wPlayerName ld bc, $ff00 .asm_5677d ld a, [hli] diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index a98f5f3f..9048fc39 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -83,7 +83,7 @@ Func_76610: ; 76610 (1d:6610) ld [wWhichTrade], a ld [wcf91], a ld [wd0b5], a - ld [wcfd9], a + ld [wBattleMonSpecies2], a ld [wcf1d], a ld a, [hli] ld [wTrainerFacingDirection], a diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index ef6e9899..5f2c1cd5 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -355,7 +355,7 @@ ContinueGame: ; 5db5 (1:5db5) call PlaceString FuncCoord 12, 9 ld hl, Coord - ld de, W_PLAYERNAME ; wd158 + ld de, wPlayerName ; wd158 call PlaceString FuncCoord 17, 11 ld hl, Coord @@ -384,7 +384,7 @@ PrintSaveScreenText: ; 5def (1:5def) ld de, SaveScreenInfoText call PlaceString ld hl, wTileMap + $34 - ld de, W_PLAYERNAME + ld de, wPlayerName call PlaceString ld hl, wTileMap + $61 call Func_5e2f diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 26e7227f..35c8be12 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -67,7 +67,7 @@ Func_655c: ; 655c (1:655c) ld a, [wcf4b] cp $50 jr z, .asm_6594 - ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME + ld hl, wPartyMonNicks ; wPartyMonNicks ld bc, $b ld a, [wWhichPokemon] ; wWhichPokemon call AddNTimes diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index aefb2438..8ad5260d 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -32,7 +32,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) callba SendBlkPacket_PartyMenu ; loads some data to wcf2e FuncCoord 3,0 ld hl,Coord - ld de,W_PARTYMON1 + ld de,wPartySpecies xor a ld c,a ld [$FF8C],a ; loop counter @@ -46,7 +46,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) push hl ld a,c push hl - ld hl,W_PARTYMON1NAME + ld hl,wPartyMonNicks call GetPartyMonName pop hl call PlaceString ; print the pokemon's name @@ -231,7 +231,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) ld l,a push hl ld a,[wcf06] - ld hl,W_PARTYMON1NAME + ld hl,wPartyMonNicks call GetPartyMonName pop hl call PrintText diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 931de340..6a21a50e 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -8,7 +8,7 @@ StartMenu_Pokedex: ; 13095 (4:7095) jp RedisplayStartMenu StartMenu_Pokemon: ; 130a9 (4:70a9) - ld a,[W_NUMINPARTY] + ld a,[wPartyCount] and a jp z,RedisplayStartMenu xor a @@ -86,7 +86,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) add hl,bc jp .choseOutOfBattleMove .choseSwitch - ld a,[W_NUMINPARTY] + ld a,[wPartyCount] cp a,2 ; is there more than one pokemon in the party? jp c,StartMenu_Pokemon ; if not, no switching call SwitchPartyMon_Stats @@ -107,7 +107,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) .choseOutOfBattleMove push hl ld a,[wWhichPokemon] - ld hl,W_PARTYMON1NAME + ld hl,wPartyMonNicks call GetPartyMonName pop hl ld a,[hl] @@ -138,7 +138,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) call CheckIfInOutsideMap jr z,.canFly ld a,[wWhichPokemon] - ld hl,W_PARTYMON1NAME + ld hl,wPartyMonNicks call GetPartyMonName ld hl,.cannotFlyHereText call PrintText @@ -211,7 +211,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) call CheckIfInOutsideMap jr z,.canTeleport ld a,[wWhichPokemon] - ld hl,W_PARTYMON1NAME + ld hl,wPartyMonNicks call GetPartyMonName ld hl,.cannotUseTeleportNowText call PrintText @@ -239,9 +239,9 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) TX_FAR _CannotFlyHereText db "@" .softboiled - ld hl,W_PARTYMON1_MAXHP + ld hl,wPartyMon1MaxHP ld a,[wWhichPokemon] - ld bc,44 + ld bc,wPartyMon2 - wPartyMon1 call AddNTimes ld a,[hli] ld [H_DIVIDEND],a @@ -251,7 +251,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) ld [H_DIVISOR],a ld b,2 ; number of bytes call Divide - ld bc,-33 + ld bc,wPartyMon1HP - wPartyMon1MaxHP add hl,bc ld a,[hld] ld b,a @@ -615,7 +615,7 @@ DrawTrainerInfo: ; 1349a (4:749a) call PlaceString FuncCoord 7,2 ld hl,Coord - ld de,W_PLAYERNAME + ld de,wPlayerName call PlaceString FuncCoord 8,4 ld hl,Coord @@ -788,7 +788,7 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld [wcc35], a push hl push de - ld hl, W_PARTYMON1 ; W_PARTYMON1 + ld hl, wPartySpecies ld d, h ld e, l ld a, [wCurrentMenuItem] ; wCurrentMenuItem @@ -809,15 +809,15 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld [hl], a ld a, [H_DIVIDEND] ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ld [de], a - ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA) - ld bc, $2c + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 ld a, [wCurrentMenuItem] ; wCurrentMenuItem call AddNTimes push hl ld de, wcc97 ld bc, $2c call CopyData - ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA) + ld hl, wPartyMons ld bc, $2c ld a, [wcc35] call AddNTimes @@ -829,14 +829,14 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld hl, wcc97 ld bc, $2c call CopyData - ld hl, W_PARTYMON1OT ; wd273 + ld hl, wPartyMonOT ; wd273 ld a, [wCurrentMenuItem] ; wCurrentMenuItem call SkipFixedLengthTextEntries push hl ld de, wcc97 ld bc, $b call CopyData - ld hl, W_PARTYMON1OT ; wd273 + ld hl, wPartyMonOT ; wd273 ld a, [wcc35] call SkipFixedLengthTextEntries pop de @@ -847,14 +847,14 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld hl, wcc97 ld bc, $b call CopyData - ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME + ld hl, wPartyMonNicks ; wPartyMonNicks ld a, [wCurrentMenuItem] ; wCurrentMenuItem call SkipFixedLengthTextEntries push hl ld de, wcc97 ld bc, $b call CopyData - ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME + ld hl, wPartyMonNicks ; wPartyMonNicks ld a, [wcc35] call SkipFixedLengthTextEntries pop de diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index ed042480..2d33e79f 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -143,15 +143,15 @@ StatusScreen: ; 12953 (4:6953) jp SkipFixedLengthTextEntries OTPointers: ; 12a95 (4:6a95) - dw W_PARTYMON1OT - dw W_ENEMYMON1OT - dw W_BOXMON1OT + dw wPartyMonOT + dw wEnemyMonOT + dw wBoxMonOT dw W_DAYCAREMONOT NamePointers2: ; 12a9d (4:6a9d) - dw W_PARTYMON1NAME - dw W_ENEMYMON1NAME - dw W_BOXMON1NAME + dw wPartyMonNicks + dw wEnemyMonNicks + dw wBoxMonNicks dw W_DAYCAREMONNAME Type1Text: ; 12aa5 (4:6aa5) |