diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-07-10 21:11:03 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-07-10 21:27:24 -0400 |
| commit | 96656fdc69964c2f4d7e0ce2c3dbfd1729f75af0 (patch) | |
| tree | 103935618b8f9c8050b37fd4e51387e0a6fe0099 /engine/events | |
| parent | Replace "branch" labels in SFX files with local names (diff) | |
| download | pokeyellow-96656fdc69964c2f4d7e0ce2c3dbfd1729f75af0.tar.gz pokeyellow-96656fdc69964c2f4d7e0ce2c3dbfd1729f75af0.tar.xz pokeyellow-96656fdc69964c2f4d7e0ce2c3dbfd1729f75af0.zip | |
Identify some `.asm_*` labels
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/hidden_objects/bench_guys.asm | 4 | ||||
| -rw-r--r-- | engine/events/hidden_objects/cinnabar_gym_quiz.asm | 4 | ||||
| -rw-r--r-- | engine/events/pewter_guys.asm | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/hidden_objects/bench_guys.asm b/engine/events/hidden_objects/bench_guys.asm index b41434ad..55090c01 100644 --- a/engine/events/hidden_objects/bench_guys.asm +++ b/engine/events/hidden_objects/bench_guys.asm @@ -79,9 +79,9 @@ SaffronCityPokecenterBenchGuyText:: text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SaffronCityPokecenterBenchGuyText2 - jr nz, .asm_624f2 + jr nz, .printText ld hl, SaffronCityPokecenterBenchGuyText1 -.asm_624f2 +.printText call PrintText jp TextScriptEnd diff --git a/engine/events/hidden_objects/cinnabar_gym_quiz.asm b/engine/events/hidden_objects/cinnabar_gym_quiz.asm index 629f2dce..6a45c2be 100644 --- a/engine/events/hidden_objects/cinnabar_gym_quiz.asm +++ b/engine/events/hidden_objects/cinnabar_gym_quiz.asm @@ -39,7 +39,7 @@ CinnabarGymQuiz:: call PrintText ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - call CinnabarGymQuiz_1ea92 + call CinnabarGymQuiz_AskQuestion jp TextScriptEnd CinnabarGymQuizDummyIntroText: @@ -86,7 +86,7 @@ CinnabarQuizQuestionsText6: text_far _CinnabarQuizQuestionsText6 text_end -CinnabarGymQuiz_1ea92: +CinnabarGymQuiz_AskQuestion: call YesNoChoice ldh a, [hGymGateAnswer] ld c, a diff --git a/engine/events/pewter_guys.asm b/engine/events/pewter_guys.asm index 532fa4bf..06bb60fb 100644 --- a/engine/events/pewter_guys.asm +++ b/engine/events/pewter_guys.asm @@ -8,7 +8,7 @@ PewterGuys: add hl, de ld d, h ld e, l - ld hl, PointerTable_37ce6 + ld hl, PewterGuysCoordsTable ld a, [wWhichPewterGuy] add a ld b, 0 @@ -48,7 +48,7 @@ PewterGuys: inc hl jr .findMatchingCoordsLoop -PointerTable_37ce6: +PewterGuysCoordsTable: dw PewterMuseumGuyCoords dw PewterGymGuyCoords |