diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 18:21:53 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 19:42:56 -0500 |
| commit | 32ed487a476e01759d3d9dbc818d8566ae2c9cb7 (patch) | |
| tree | 669e90b56d36f17efff5f673235193f5298c0ceb /engine/mail_2.asm | |
| parent | 6ff2cb20e67db2054486fc5dc48eb9263298d4ad (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
Diffstat (limited to 'engine/mail_2.asm')
| -rwxr-xr-x | engine/mail_2.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/mail_2.asm b/engine/mail_2.asm index 4450063a4..6e326641b 100755 --- a/engine/mail_2.asm +++ b/engine/mail_2.asm @@ -1,5 +1,5 @@ ReadPartyMonMail: ; b9229 - ld a, [CurPartyMon] + ld a, [wCurPartyMon] ld hl, sPartyMail ld bc, MAIL_STRUCT_LENGTH call AddNTimes @@ -35,7 +35,7 @@ ReadAnyMail: ; b9237 call .LoadGFX call EnableLCD call WaitBGMap - ld a, [Buffer3] + ld a, [wBuffer3] ld e, a farcall LoadMailPalettes call SetPalettes @@ -74,11 +74,11 @@ ReadAnyMail: ; b9237 ld de, sPartyMon1MailAuthorID - sPartyMon1Mail add hl, de ld a, [hli] - ld [Buffer1], a + ld [wBuffer1], a ld a, [hli] - ld [Buffer2], a + ld [wBuffer2], a ld a, [hli] - ld [CurPartySpecies], a + ld [wCurPartySpecies], a ld b, [hl] call CloseSRAM ld hl, MailGFXPointers @@ -100,7 +100,7 @@ ReadAnyMail: ; b9237 .got_pointer ld a, c - ld [Buffer3], a + ld [wBuffer3], a ld a, [hli] ld h, [hl] ld l, a @@ -567,7 +567,7 @@ LoadPortraitMailGFX: ; b96ca call Mail_DrawRowLoop call LovelyEonMail_PlaceIcons ld a, $1 - ld [UnownLetter], a + ld [wUnownLetter], a hlcoord 1, 10 call PrepMonFrontpic pop hl @@ -712,7 +712,7 @@ MailGFX_PlaceMessage: ; b9803 ld a, [de] and a ret z - ld a, [Buffer3] + ld a, [wBuffer3] hlcoord 8, 14 cp $3 ; PORTRAITMAIL jr z, .place_author |