diff options
| author | dannye <33dannye@gmail.com> | 2022-09-11 23:34:59 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2022-09-12 00:53:37 -0500 |
| commit | ecab35295aefb44227ba38f257dc40c8c10474e3 (patch) | |
| tree | d04160bc19180ee50a941d121f90cc7071e7a672 /engine/events | |
| parent | Replace Hard-Coded Number With Constant (diff) | |
| parent | Add `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff) | |
| download | pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.gz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.xz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/diploma2.asm | 16 | ||||
| -rw-r--r-- | engine/events/hidden_objects/museum_fossils2.asm | 2 | ||||
| -rw-r--r-- | engine/events/hidden_objects/safari_game.asm | 2 | ||||
| -rw-r--r-- | engine/events/in_game_trades.asm | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/engine/events/diploma2.asm b/engine/events/diploma2.asm index efc3b9cd..87a44439 100644 --- a/engine/events/diploma2.asm +++ b/engine/events/diploma2.asm @@ -23,11 +23,11 @@ _DisplayDiploma: hlcoord 19, 0 ld [hl], a - ld de, String_e9a73 + ld de, DiplomaText hlcoord 5, 2 call PlaceString - ld de, String_e9a7d + ld de, DiplomaPlayer hlcoord 3, 4 call PlaceString @@ -35,11 +35,11 @@ _DisplayDiploma: hlcoord 10, 4 call PlaceString - ld de, String_e9a84 + ld de, DiplomaCongrats hlcoord 2, 6 call PlaceString - ld de, String_e9ac8 + ld de, DiplomaGameFreak hlcoord 9, 16 call PlaceString @@ -51,20 +51,20 @@ _DisplayDiploma: call GBPalNormal ret -String_e9a73: +DiplomaText: db CIRCLE_TILE_ID, "Diploma", CIRCLE_TILE_ID, "@" -String_e9a7d: +DiplomaPlayer: db "Player@" -String_e9a84: +DiplomaCongrats: db "Congrats! This" next "diploma certifies" next "that you have" next "completed your" next "#DEX.@" -String_e9ac8: +DiplomaGameFreak: db "GAME FREAK@" Func_e9ad3: diff --git a/engine/events/hidden_objects/museum_fossils2.asm b/engine/events/hidden_objects/museum_fossils2.asm index fce0f03a..d8090e0a 100644 --- a/engine/events/hidden_objects/museum_fossils2.asm +++ b/engine/events/hidden_objects/museum_fossils2.asm @@ -14,7 +14,7 @@ DisplayMonFrontSpriteInBox: ld a, [wcf91] ld [wd0b5], a call GetMonHeader - ld de, vChars1 + $310 + ld de, vChars1 tile $31 call LoadMonFrontSprite ld a, $80 ldh [hStartTileID], a diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm index 5a267346..2863a201 100644 --- a/engine/events/hidden_objects/safari_game.asm +++ b/engine/events/hidden_objects/safari_game.asm @@ -36,7 +36,7 @@ SafariZoneGameOver: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .waitForMusicToPlay - ld a, [wChannelSoundIDs + Ch5] + ld a, [wChannelSoundIDs + CHAN5] cp SFX_SAFARI_ZONE_PA jr nz, .waitForMusicToPlay ld a, TEXT_SAFARI_GAME_OVER diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm index a0a23dfa..1b7d2678 100644 --- a/engine/events/in_game_trades.asm +++ b/engine/events/in_game_trades.asm @@ -244,7 +244,7 @@ InGameTrade_CheckForTradeEvo: ld [wForceEvolution], a ld a, LINK_STATE_TRADING ld [wLinkState], a - callfar EvolveTradeMon + callfar TryEvolvingMon xor a ; LINK_STATE_NONE ld [wLinkState], a jp PlayDefaultMusic |