diff options
Diffstat (limited to 'mobile')
| -rwxr-xr-x | mobile/battle_tower_5c.asm | 12 | ||||
| -rw-r--r-- | mobile/mobile_45.asm | 102 | ||||
| -rwxr-xr-x | mobile/mobile_46.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 2 |
4 files changed, 59 insertions, 59 deletions
diff --git a/mobile/battle_tower_5c.asm b/mobile/battle_tower_5c.asm index b5ef96fdd..da1691038 100755 --- a/mobile/battle_tower_5c.asm +++ b/mobile/battle_tower_5c.asm @@ -1519,15 +1519,15 @@ Jumptable_1709e7: ; 1709e7 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e - jr z, .no_trigger + jr z, .no_scene ld a, [de] and a ret nz -.no_trigger +.no_scene ld a, $1 ld [ScriptVar], a ret @@ -1544,14 +1544,14 @@ Jumptable_1709e7: ; 1709e7 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e - jr z, .no_trigger_2 + jr z, .no_scene_2 xor a ld [de], a -.no_trigger_2 +.no_scene_2 ret ; 170a9c diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index b804bb473..1c2adbfce 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -432,7 +432,7 @@ Function1143b7: ; 1143b7 pop hl push af ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -682,7 +682,7 @@ Function1144d1: ; 1144d1 .asm_11451c pop hl ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -699,7 +699,7 @@ Function1144d1: ; 1144d1 .asm_114537 ld hl, $dc06 ld a, [hl] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld hl, $dc09 @@ -710,7 +710,7 @@ Function1144d1: ; 1144d1 ld a, d or e jr z, .asm_114559 - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld e, [hl] inc hl ld d, [hl] @@ -1275,7 +1275,7 @@ Function114843: ; 114843 Function114867: ; 114867 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1303,7 +1303,7 @@ Function114867: ; 114867 inc e call z, Function1148b9 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1334,7 +1334,7 @@ Function114867: ; 114867 Function1148b9: ; 1148b9 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1344,7 +1344,7 @@ Function1148b9: ; 1148b9 Function1148c2: ; 1148c2 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1397,7 +1397,7 @@ Function1148c2: ; 1148c2 inc e call z, Function114944 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1436,7 +1436,7 @@ Function1148c2: ; 1148c2 Function114944: ; 114944 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1446,7 +1446,7 @@ Function114944: ; 114944 Function11494d: ; 11494d ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1491,7 +1491,7 @@ Function11494d: ; 11494d inc e call z, Function1149c3 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1530,7 +1530,7 @@ Function11494d: ; 11494d Function1149c3: ; 1149c3 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1540,7 +1540,7 @@ Function1149c3: ; 1149c3 Function1149cc: ; 1149cc ld hl, $dc06 ld a, [hl] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a push de @@ -1559,7 +1559,7 @@ Function1149cc: ; 1149cc ld [hl], d dec hl ld [hl], e - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld e, [hl] inc hl ld d, [hl] @@ -1572,7 +1572,7 @@ Function1149cc: ; 1149cc inc e call z, Function114a0f ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1590,7 +1590,7 @@ Function1149cc: ; 1149cc Function114a0f: ; 114a0f push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1903,7 +1903,7 @@ endr .asm_114b96 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1954,7 +1954,7 @@ Function114bbc: ; 114bbc jr z, .asm_114bff pop hl ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2187,7 +2187,7 @@ endr .asm_114d11 pop hl ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2497,7 +2497,7 @@ Function114e62: ; 114e62 Function114ea0: ; 114ea0 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2522,7 +2522,7 @@ Function114ea0: ; 114ea0 inc e call z, Function114ee0 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -2544,7 +2544,7 @@ Function114ea0: ; 114ea0 Function114ee0: ; 114ee0 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -2787,7 +2787,7 @@ Function115020: ; 115020 push hl ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2814,7 +2814,7 @@ Function115020: ; 115020 .asm_115046 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -2834,7 +2834,7 @@ Function115020: ; 115020 Function115059: ; 115059 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3003,7 +3003,7 @@ Function1150b3: ; 1150b3 Function115136: ; 115136 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -3030,7 +3030,7 @@ Function115136: ; 115136 .asm_11515d ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -3050,7 +3050,7 @@ Function115136: ; 115136 Function115170: ; 115170 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3060,7 +3060,7 @@ Function115170: ; 115170 Function115179: ; 115179 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -3155,7 +3155,7 @@ Function115179: ; 115179 inc e call z, Function11520e ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -3171,7 +3171,7 @@ Function115179: ; 115179 Function11520e: ; 11520e push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3182,7 +3182,7 @@ Function115217: ; 115217 push hl ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -3221,7 +3221,7 @@ Function115217: ; 115217 .asm_115252 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -3267,7 +3267,7 @@ Function115217: ; 115217 Function115286: ; 115286 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3672,7 +3672,7 @@ Function1153d2: ; 1153d2 ld [de], a ld hl, RightOrnament ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -3681,7 +3681,7 @@ Function1153d2: ; 1153d2 ld hl, $ddc8 call Function115d6a ld hl, RightOrnament - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -3911,7 +3911,7 @@ Function1155d1: ; 1155d1 Function11560a: ; 11560a ld a, [$dc06] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld a, [$dc17] ld [$dc00], a ld [hFF8C], a @@ -3986,16 +3986,16 @@ Function11560a: ; 11560a inc hl ld [hl], d pop bc - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hFF8C], a ld [MBC3SRamBank], a - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld e, [hl] inc hl ld d, [hl] ld hl, $dc24 call Function115d6a - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld [hl], e inc hl ld [hl], d @@ -4008,7 +4008,7 @@ Function11560a: ; 11560a jr nz, .asm_11564d .asm_1156a9 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [$dc06], a xor a ret @@ -4354,9 +4354,9 @@ Function11581e: ; 11581e ld [wCurrMapCallbackHeaderPointer], a pop bc pop hl - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -4364,8 +4364,8 @@ Function11581e: ; 11581e ld d, [hl] ld hl, PartyMon5Speed call Function115d6a - ld hl, wCurrMapTriggerCount - ld a, [wCurrentMapSignpostCount] + ld hl, wCurrMapSceneScriptCount + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -4921,9 +4921,9 @@ Function115b00: ; 115b00 ld [wCurrMapCallbackHeaderPointer], a pop bc pop hl - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -4931,8 +4931,8 @@ Function115b00: ; 115b00 ld d, [hl] ld hl, $dc26 call Function115d6a - ld hl, wCurrMapTriggerCount - ld a, [wCurrentMapSignpostCount] + ld hl, wCurrMapSceneScriptCount + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -5312,7 +5312,7 @@ Function115d6a: ; 115d6a Function115d77: ; 115d77 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 6e0aed218..150f9baa7 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -7632,7 +7632,7 @@ Function11b7e5: ; 11b7e5 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e jr z, .asm_11b872 diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index cf779e56a..ea485089c 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -314,7 +314,7 @@ Function17d0f3: ; 17d0f3 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e jr z, .asm_17d180 |